diff options
| author | Jenkins for ownCloud <thomas.mueller@tmit.eu> | 2013-08-16 00:57:02 +0400 |
|---|---|---|
| committer | Jenkins for ownCloud <thomas.mueller@tmit.eu> | 2013-08-16 00:57:02 +0400 |
| commit | f78749d2cd73161f9b6a9ef84eabcac22d7ab960 (patch) | |
| tree | f0da859938a579c7ba1a5502745e7a2ef25600d3 | |
| parent | 0995377d399ea493e3171c22caf0bda7726d1104 (diff) | |
[tx-robot] updated from transifex
28 files changed, 6110 insertions, 12052 deletions
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 3724d14f9..fc6e127b8 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -7,22 +7,17 @@ <translation>Formulari</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Srincronitza la carpeta</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Escolliu una carpeta local en l'ordinador per sincronitzar:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Escull...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Àlies de la carpeta:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulari</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Destí de sincronització</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Afegeix una carpeta</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Refresca</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Afegeix sincronització...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausa</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Elimina</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Informació...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Continua</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirma l'eliminació de la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Comprovant la connexió %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>La connexió %1 no està configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>S'està sincronitzant</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>S'està sincronitzant.<br/>Voleu parar-la?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>La connexió amb %1 ha fallat: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Sincronització iniciada</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Surt</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Fitxers gestionats:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>No hi ha fitxers de sincronització configurats</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulari</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Fitxers</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Compta fitxers</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copia</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocol de soncronització</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>El fitxer local %1 no existeix.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Estat de carpeta indefinit</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 hauria de ser una carpeta, però no ho és.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>La carpeta espera per iniciar la sincronització.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>No es pot llegir %1.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>El servidor no està disponible actualment.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>S'està sincronitzant</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>L'última sincronització és correcte.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Error de sincronització.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Error de configuració.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Estat d'error no identificat.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>S'ha copiat al porta-retalls</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>El protocol de sincronització s'ha copiat al porta-retalls.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Fitxers sincronitzats</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Fitxers nous</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Fitxers eliminats</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Fitxers reanomenats</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Fitxers ignorats</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Errors</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflictes</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Carregat</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Descarregat</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>El fitxer local %1 no existeix.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 hauria de ser una carpeta, però no ho és.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>No es pot llegir %1.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>El fil de CSync ha acabat.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Estat indefinit.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Espera per començar la sincronització.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>S'està sincronitzant.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>La darrera sincronització va ser correcta.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Error de configuració.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Assistent de carpeta %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Mida</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Estat de la carpeta indefinit</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>La carpeta espera per començar amb la sincronització</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>S'està sincronitzant.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>La darrera sincronització va ser correcta.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Error de sincronització.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Error de configuració.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Estat d'error no definit.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>S'ha copiat al porta-retalls</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>El protocol de sincronització s'ha copiat al porta-retalls.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Sortida de registre</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Cerca:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Troba</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Neteja</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Neteja l'inici de sessió.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Des&a</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Desa el fitxer de registre al disc per depuració</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>El fitxer '%1'<br/>no es pot obrir en mode escriptura.<br/><br/>La sortida del registre <b>no</b> es pot desar!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Desa el fitxer de registre</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>No s'ha pogut escriure el fitxer de registre</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>La carpeta local %1 ja existeix, s'està configurant per sincronitzar.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Creant carpeta local de sincronització %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>correcte</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>ha fallat.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>La carpeta remota %1 s'ha creat correctament.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creació de la carpeta ha resultat en el codi d'error HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La creació de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.</font><br/>Comproveu les vostres credencials.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Connectat amb èxit a %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Fitxers nous disponibles</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>%1' s'ha sincronitzat amb aquesta màquina.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Fitxers nous disponibles</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' i %n altres fitxer(s) s'han sincronitzat amb aquest equip.</numerusform><numerusform>'%1' i %n altres fitxer(s) s'han sincronitzat amb aquest equip.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Fitxer esborrat</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>S'ha esborrat '%1'</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Fitxers eliminats</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' i %n altres fitxer(s) s'han esborrat.</numerusform><numerusform>'%1' i %n altres fitxer(s) s'han esborrat.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Fitxer actualitzat</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' s'ha actualitzat</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Fitxers actualitzats</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' i %n altres fitxer(s) s'han actualitzat.</numerusform><numerusform>'%1' i %n altres fitxer(s) s'han actualitzat.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Escriviu la url de ownCloud amb la que voleu contactar (sense http o https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation type="unfinished"/> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index adf2671b6..57b59d5c2 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -7,22 +7,17 @@ <translation>Formulář</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Synchronizace adresáře</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Pro synchronizaci vyberte místní složku na Vašem počítači:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>Vy&brat...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Alias názvu adresáře:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulář</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Cíl synchronizace</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Zvolte cílovou složku</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Přidat složku</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Obnovit</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> - <translation type="unfinished"/> + <translation>Složky</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation>Editovat ignorované soubory</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Odebrat účet</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Upravit účet</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Stav synchronizace</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Připojen k <server> jako <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Přidat synchronizaci...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pozastavit</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Restartovat složku</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Obsazený prostor</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Zjišťuji obsazený prostor...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Obnovit</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Potvrdit odstranění složky</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Potvrdit restartování složky</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Opravdu chcete provést restart synchronizace složky <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Přestože nebudou žádné soubory odebrány, může tato operace způsobit velké datové přenosy a může trvat několik minut až hodin v závislosti na množství dat ve složce.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Kontroluji spojení s %1....</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Žádné spojení s %1 nenastaveno.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Probíhá operace synchronizace.<br/>Přejete si ji ukončit?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>Spojení s %1 selhalo: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Spuštění</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Aktuálně</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Úplně</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Úplně dokončeno.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Využíváte %1 z dostupného prostoru %2.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>Synchronizace %1 zahájena</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation><numerusform>Synchronizace zahájena pro %n nastavený adresář.</numerusform><numerusform>Synchronizace zahájena pro %n nastavené adresáře.</numerusform><numerusform>Synchronizace zahájena pro %n nastavených adresářů.</numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Otevřít %1 v prohlížeči</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Počítám kvóty...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Neznámý stav</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Nastavení...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Podrobnosti...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Ukončit</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Nic.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Otevřít místní složku '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Spravované složky:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Otevřít složku '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Kvóta nedostupná</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% z %2 využito</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Žádné položky nebyly nedávno synchronizovány</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronizuji %1 z %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>Synchronizace</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Složka %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Nejsou nastaveny žádné synchronizované složky.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Podrobný protokol synchronizace</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Textový štítek</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Soubory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Počet souborů</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopírovat</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protokol synchronizace</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Nedefinovaný stav složky</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Složka čeká na zahájení synchronizace.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Nepodařilo se vytvořit csync-context</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Zjišťuji soubory k synchronizaci.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Místní složka %1 neexistuje.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Server nyní není dostupný.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 by měl být adresář, ale není.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Probíhá synchronizace.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 není čitelný.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Poslední synchronizace byla úspěšná.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Chyba synchronizace.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Chyba nastavení.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Nedefinovaná chyba.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (poslední synchronizace před %n sekundou)</numerusform><numerusform>%1 (poslední synchronizace před %n sekundami)</numerusform><numerusform>%1 (poslední synchronizace před %n sekundami)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (poslední synchronizace před %n minutou)</numerusform><numerusform>%1 (poslední synchronizace před %n minutami)</numerusform><numerusform>%1 (poslední synchronizace před %n minutami)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Zkopírováno do schránky</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Protokol synchronizace byl zkopírován do schránky.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Synchronizované soubory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nové soubory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Smazané soubory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Přejmenované soubory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Ignorované soubory</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Chyby</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Konflikty</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Odesláno</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Staženo</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Nepodařilo se vytvořit csync-context</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Místní složka %1 neexistuje.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 by měl být adresář, ale není.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 není čitelný.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Vlákno CSync ukončeno.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Synchronizace by smazala všechny soubory v místní složce '%1' Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím Opravdu chcete provést tuto akci?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Odstranit všechny soubory?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Odstranit všechny soubory</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Ponechat soubory</translation> </message> @@ -752,47 +648,47 @@ Opravdu chcete provést tuto akci?</translation> <translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Vyčkává na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizace.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Server je nyní nedostupný.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -801,7 +697,7 @@ Opravdu chcete provést tuto akci?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Soubor</translation> </message> @@ -830,8 +726,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Průvodce složkou %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1026,186 +923,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Textový štítek</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Adresář/čas</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Soubor</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Akce</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Kopie</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Protokol synchronizace</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Nedefinovatelný stav složky</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Složka vyčkává na spuštění synchronizace.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Synchronizace probíhá.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Poslední synchronizace byla úspěšná.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Chyba synchronizace.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Chyba nastavení.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Nedefinovatelná chyba.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Zkopírováno do schránky</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>Protokol synchronizace byl zkopírován do schránky</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problém: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Zaznamenat výstup</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Hledat: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>Na&jít</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Vyčistit výpis logu.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&Uložit</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Uložit soubor záznamu na disk pro ladění.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Soubor '%1'<br/>nelze otevřít pro zápis.<br/><br/>Výstup záznamu <b>nelze</b> uložit.</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Uložit log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Nemohu zapisovat do log souboru</translation> </message> @@ -1403,17 +1254,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Přejmenování složky selhalo</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Nedaří se přesunout a zazálohovat složku, protože složka nebo soubor v ní je právě používána jiným programem. Ukončete práci s touto složkou nebo souborem a zkuste to znovu nebo ukončete nastavení.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Místní synchronizovaná složka %1 byla vytvořena úspěšně!</b></font></translation> </message> @@ -1438,94 +1289,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Selhalo spojení s %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Vytvářím místní synchronizovanou složku %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>selhalo.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Nelze vytvořit místní složku %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Nelze přistoupit ke vzdálené složce!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>vytvářím složku na ownCloudu: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdálená složka %1 byla úspěšně vytvořena.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytvoření složky selhalo HTTP chybou %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se, prosím, zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se, prosím, zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytváření vzdálené složky %1 selhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Úspěšně spojeno s %1.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation> </message> @@ -1572,69 +1423,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Je dostupný nový soubor</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' byl synchronizován s tímto počítačem</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Jsou dostupné nové soubory</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform> '%1' a %n další soubor byly synchronizovány s tímto počítačem.</numerusform><numerusform> '%1' a %n další soubory byly synchronizovány s tímto počítačem.</numerusform><numerusform> '%1' a %n dalších souborů bylo synchronizováno s tímto počítačem.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Soubor odebrán</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' byl odebrán.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Soubory odebrány</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform> '%1' a %n další soubor byly odebrány.</numerusform><numerusform> '%1' a %n další soubory byly odebrány.</numerusform><numerusform> '%1' a %n dalších souborů bylo odebráno.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Soubor aktualizován</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' byl aktualizován.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Soubory aktualizovány</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform> '%1' a %n další soubor byly aktualizovány.</numerusform><numerusform> '%1' a %n další soubory byly aktualizovány.</numerusform><numerusform> '%1' a %n dalších souborů bylo aktualizováno.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1643,8 +1431,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>Nastavení %1</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1916,7 +1704,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> @@ -1970,7 +1758,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Zadejte URL ownCloud, ke které si přejete se připojit (bez http, či https).</translation> </message> @@ -2011,13 +1799,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Adresa serveru</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2033,7 +1821,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Popis chyby</translation> </message> @@ -2210,12 +1998,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Systémová lišta není k dispozici</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 vyžaduje fungující systémovou lištu. Pokud používáte XFCE, řiďte se <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">těmito instrukcemi</a>. V ostatních případech prosím nainstalujte do svého systému aplikaci pro systémovou lištu, např. 'trayer', a zkuste to znovu.</translation> </message> diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index f37145bcc..7428c6a38 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -7,22 +7,17 @@ <translation>Formular</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Sync-Verzeichnis</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>lokales Verzeichnis zum Synchronisieren auswählen:</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Wählen Sie...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Verzeichnis-Alias-Name:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formular</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Synchronisationsziel</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Wählen Sie einen Zielordner</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Ordner hinzufügen</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Aktualisieren</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Ordner</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Textfeld</translation> </message> @@ -83,108 +73,98 @@ <translation>Ignorierte Dateien bearbeiten</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Nutzerkonto entfernen</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Nutzerkonto ändern</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Synchronisation-Status</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Verbunden mit <server> als <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Sync. hinzufügen...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Anhalten</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Speicherbelegung</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Nutzungsinformationen abrufen...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Löschen des Ordners bestätigen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Zurücksetzen des Ordners bestätigen</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf diesem Rechner neu aufbauen?</p><p><b>Anmerkung:</b> 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.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Überprüfe %1-Verbindung...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Verbindung mit %1 fehlgeschlagen <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Gegenwärtig</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Vollständig</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Vollständig abgeschlossen.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Sie benutzen %1 von Ihrem verfügbaren %2 Speicherplatz.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Sync gestartet</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Berechne Quote...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Details...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Beenden</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Keine.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Öffne lokalen Ordner '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Ordner '%1' öffnen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Quote unbekannt</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% von %2 benutzt</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchronisiere %1 von %2 (%3 von %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>Synchron</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Keine Sync-Ordner konfiguriert.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Detailliertes Synchronisationsprotokoll</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Textfeld</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Dateien</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Anzahl Dateien</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Synchronisationsprotokoll</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Nicht definierter Ordner-Zustand</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Der Ordner wartet auf den Beginn der Synchronisation.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Kann keinen CSync-Kontext erstellen</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Prüfe, welche Dateien synchronisiert werden müssen.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Lokales Verzeichnis %1 existiert nicht.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Der Server ist momentan nicht erreichbar.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Synchronisation läuft.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 ist nicht lesbar.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Die letzte Synchronisation war erfolgreich.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Fehler bei der Synchronisation .</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Setup-Fehler</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Undefinierter Fehler-Zustand.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (zuletzt vor %n Sekunde beendet)</numerusform><numerusform>%1 (zuletzt vor %n Sekunden beendet)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (zuletzt vor %n Minute beendet)</numerusform><numerusform>%1 (zuletzt vor %n Minuten beendet)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>In die Zwischenablage kopiert</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Das Synchronisierungs-Protokoll wurde in die Zwischenablage kopiert.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Synchronisierte Dateien</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Neue Dateien</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>gelöschte Dateien</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Umbenannte Dateien</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>ignorierte Dateien</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Fehler</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Konflikte</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Hochgeladen</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Heruntergeladen</translation> - </message> -</context> -<context> - <name>Mirall::Folder</name> - <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Kann keinen CSync-Kontext erstellen</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Lokales Verzeichnis %1 existiert nicht.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 ist nicht lesbar.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Der CSync-Thread wurde beendet.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen. Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Lösche alle Dateien</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> @@ -752,47 +648,47 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Wartet auf Beginn der Synchronistation</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Der Server ist momentan nicht erreichbar.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Setup-Fehler.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> @@ -801,7 +697,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Datei</translation> </message> @@ -832,8 +728,9 @@ Dokumentation für mögliche Lösungen.</translation> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Ordner-Assistent</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1030,186 +927,140 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Textfeld</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Odner/Zeit</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Synchronisationsprotokoll</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Nicht definierter Ordner-Zustand</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Der Ordner wartet auf den Beginn der Synchronistation.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Prüfe, welche Dateien synchronisiert werden müssen.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Der Server ist momentan nicht erreichbar.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Synchronisation läuft.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Die letzte Synchronisation war erfolgreich.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Fehler bei der Synchronisation.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Setup-Fehler.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>Synchronisation erfolgreich, aber mit Warnungen für einzelne Dateien.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Undefinierter Fehler-Zustand.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>Datei ignoriert.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>Verzeichnis ignoriert.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>Symbolische Verknüpfung ignoriert</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>Ignoriert.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>In die Zwischenablage kopiert</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>Das Synchronisierungs-Protokoll wurde in die Zwischenablage kopiert.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problem: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Log-Ausgabe</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Suche:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Finde</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Leeren</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Protokollanzeige löschen.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&peichern</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Speichere die Protokolldatei zur Fehleranalyse</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Datei '%1'<br/>kann nicht zum Schreiben geöffnet werden.<br/><br/>Die Protokolldatei kann <b>nicht</b> gespeichert werden!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Log-Datei speichern</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Log-Datei konnte nicht geschrieben werden</translation> </message> @@ -1407,17 +1258,17 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Ordner umbenennen fehlgeschlagen.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kann den Ordner nicht entfernen und sichern, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner ode die Datei oder beenden Sie das Setup.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation> </message> @@ -1442,94 +1293,94 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <translation>Die Verbindung zu %1 konnte nicht hergestellt werden:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>Fehler: Falsche Anmeldeinformationen.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Erstelle lokalen Sync-Ordner %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>fehlgeschlagen.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Auf den entfernten Ordner konnte nicht zugegriffen werden!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>erstelle Ordner auf ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Remoteordner %1 erfolgreich erstellt.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Erfolgreich verbunden mit %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation> </message> @@ -1576,69 +1427,6 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Neue Datei verfügbar</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' wurde mit diesem Gerät synchronisiert.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Neue Dateien sind verfügbar</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' und %n andere Datei wurden mit der Gerät synchronisiert.</numerusform><numerusform>'%1' und %n andere Dateien wurden mit den Gerät synchronisiert.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Datei gelöscht</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' wurde gelöscht.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Dateien gelöscht</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>%1' und %n andere Dateien wurden entfernt.</numerusform><numerusform>%1' und %n andere Dateien wurden entfernt.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Datei aktualisiert</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' wurde aktualisiert.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Dateien aktualisiert</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>%1' und %n andere Dateien wurden aktualisiert.</numerusform><numerusform>%1' und %n andere Dateien wurden aktualisiert.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1647,8 +1435,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1 Einstellungen</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1920,7 +1708,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Textbeschriftung</translation> </message> @@ -1974,7 +1762,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Bitte tragen Sie die Adresse Ihrer ownCloud ein, zu der Sie Sich verbinden möchten (mit oder ohne http oder https).</translation> </message> @@ -2015,13 +1803,13 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Serveradresse</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2037,7 +1825,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Error Label</translation> </message> @@ -2214,12 +2002,12 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Die Taskleiste ist nicht verfügbar.</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 wird für eine funktionierende Taskleiste benötigt. Falls Sie XFCE einsetzen, dann folgen Sie bitte <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">diesen Anweisungen</a>. Anderenfalls installieren Sie bitte eine Taskleisten-Anwendung wie 'trayer' und versuchen Sie es erneut.</translation> </message> diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 476068f57..6fb434c43 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -7,22 +7,17 @@ <translation>Φόρμα</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Συγχρονισμός Καταλόγου</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Επιλέξτε έναν τοπικό φάκελο για συγχρονισμό:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Επιλογή...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Ψευδώνυμο καταλόγου:</translation> </message> @@ -35,32 +30,27 @@ <translation>Φόρμα</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Στοχος συγχρονισμου</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Επιλέξτε ένα φάκελο προορισμού</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Προσθήκη Φακέλου</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Ανανέωση </translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -75,7 +65,7 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="20"/> <source>Account Maintenance</source> - <translation type="unfinished"/> + <translation>Συντήρηση Λογαριασμού</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="29"/> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> - <translation type="unfinished"/> + <translation>Τροποποίηση Λογαριασμού</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> - <translation type="unfinished"/> + <translation>Κατάσταση Συγχρονισμού</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Προσθήκη συγχρονισμού...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Παύση</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Αφαίρεση</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Πληροφορίες...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> - <translation type="unfinished"/> + <translation>Χρήση Αποθηκευτικού Χώρου</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> - <translation type="unfinished"/> + <translation>Λήψη πληροφοριών χρήσης...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Συνέχεια</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Επιβεβαίωση αφαίρεσης φακέλου</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Έλεγχος σύνδεσης %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Ο Συγχρονισμός Εκτελείται</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation> </message> @@ -209,150 +189,150 @@ <translation><p>Αποτυχία σύνδεσης με το %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> - <translation type="unfinished"/> + <translation>Έναρξη</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> - <translation type="unfinished"/> + <translation>%1 %2 %3 (%4 από %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> - <translation type="unfinished"/> + <translation>%1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Ο συγχρονισμος ξεκινησε</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> - <translation type="unfinished"/> + <translation>Άνοιγμα %1 στον περιηγητή</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> - <translation type="unfinished"/> + <translation>Άγνωστη κατάσταση</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> - <translation type="unfinished"/> + <translation>Ρυθμίσεις...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> - <translation type="unfinished"/> + <translation>Λεπτομέρειες...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Βοήθεια</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Έξοδος</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation>Πρόσφατες Αλλαγές</translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Διαχείριση αρχείων:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> - <translation type="unfinished"/> + <translation>Άνοιγμα καταλόγου '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> - <translation type="unfinished"/> + <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> + <translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> - <translation type="unfinished"/> + <translation>Φάκελος %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation> </message> @@ -527,213 +507,129 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Αρχεία</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Καταμέτρηση Αρχείων</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Αντιγραφή</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Προτοκολο συγχρονισμου</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Απροσδιόριστη Κατάσταση Φακέλου</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Αναμονή φακέλου για έναρξη συγχρονισμού.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Προσδιορίζετε ποιούς φακέλλους θα συγχρονίσετε </translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Ο συγχρονισμός εκτελείται.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation> %1 δεν είναι αναγνώσιμο. </translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Σφάλμα Συγχρονισμού.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Σφάλμα Ρυθμίσεων.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Απροσδιόριστη Κατάσταση Σφάλματος.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Αντιγραφθηκε στο clipboard</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Το προτοκολο αντιγραφθηκε στο clipboard.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Συγχρονισμένα Αρχεία</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Νέα Αρχεία</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Διαγραμμένα Αρχεία</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Μετονομασμενα αρχεια</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Αγνοημενα αρχεια</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Σφάλματα</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Διενέξεις</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Καταχωρήθηκε </translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Λυφθηκε</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation> %1 δεν είναι αναγνώσιμο. </translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Η διεργασία CSync τερματίζεται.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> - <translation type="unfinished"/> + <translation>Αφαίρεση Όλων των Αρχείων;</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> - <translation type="unfinished"/> + <translation>Αφαίρεση όλων των αρχείων</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> - <translation type="unfinished"/> + <translation>Διατήρηση αρχείων</translation> </message> </context> <context> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Απροσδιόριστη κατάσταση.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Αναμονή έναρξης συγχρονισμού.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> - <translation type="unfinished"/> + <translation>Προετοιμασία για συγχρονισμό.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Ο συγχρονισμός εκτελείται.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> - <translation type="unfinished"/> + <translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Σφάλμα Ρύθμισης.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,9 +694,9 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> - <translation type="unfinished"/> + <translation>Αρχείο</translation> </message> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="200"/> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Οδηγός Καταλόγων</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -836,12 +733,12 @@ documentation for possible fixes.</source> <message> <location filename="../src/mirall/folderwizard.cpp" line="74"/> <source>No local folder selected!</source> - <translation type="unfinished"/> + <translation>Δεν επιλέχθηκε τοπικός φάκελος!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="79"/> <source>You have no permission to write to the selected folder!</source> - <translation type="unfinished"/> + <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="102"/> @@ -884,7 +781,7 @@ documentation for possible fixes.</source> <message> <location filename="../src/mirall/folderwizard.cpp" line="192"/> <source>Enter the name of the new folder:</source> - <translation type="unfinished"/> + <translation>Εισάγετε το όνομα του νέου φακέλου:</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="211"/> @@ -900,7 +797,7 @@ documentation for possible fixes.</source> <location filename="../src/mirall/folderwizard.cpp" line="264"/> <source>Root ("/")</source> <comment>root folder</comment> - <translation type="unfinished"/> + <translation>Root ("/")</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="266"/> @@ -928,12 +825,12 @@ documentation for possible fixes.</source> <message> <location filename="../src/mirall/generalsettings.ui" line="26"/> <source>Launch on System Startup</source> - <translation type="unfinished"/> + <translation>Εκκίνηση κατά την Έναρξη</translation> </message> <message> <location filename="../src/mirall/generalsettings.ui" line="33"/> <source>Show Desktop Notifications</source> - <translation type="unfinished"/> + <translation>Εμφάνιση Ειδοποιήσεων</translation> </message> <message> <location filename="../src/mirall/generalsettings.ui" line="40"/> @@ -1014,195 +911,149 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/itemprogressdialog.ui" line="60"/> <source>3</source> - <translation type="unfinished"/> + <translation>3</translation> </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="65"/> <source>4</source> - <translation type="unfinished"/> + <translation>4</translation> </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> - <translation type="unfinished"/> + <translation>Αρχείο</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> - <translation type="unfinished"/> + <translation>Ενέργεια</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Μέγεθος</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> - <translation type="unfinished"/> + <translation>Αντιγραφή</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Απροσδιόριστη κατάσταση φακέλου</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Ο φάκελος αναμένει την έναρξη του συγχρονισμού</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Ο συγχρονισμός εκτελείται.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Σφάλμα Συγχρονισμού.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Σφάλμα Ρύθμισης.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Απροσδιόριστη κατάσταση σφάλματος.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> + <translation>Πρόβλημα: %1</translation> + </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Καταγραφή εξόδου</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Αναζήτηση:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Εύρεση</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Εκκαθάριση</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Εκκαθάριση του αρχείου συμβάντων.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Α&ποθήκευση</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Αποθήκευση του αρχείου καταγραφών στον δίσκο, για αποσφαλμάτωση. </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Το αρχειο '%1'<br/>δεν μπορει να ανοιχθει για το γραψιμο.<br/><br/>Το αρχείο καταγραφής δεν <b>μπορεί</b> να αποθηκευτεί!</nobr> </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Αποθήκευση αρχείου συμβάντων</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Δεν ήταν δυνατή η εγγραφή στο αρχείο συμβάντων</translation> </message> @@ -1242,7 +1093,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/networksettings.ui" line="100"/> <source>:</source> - <translation type="unfinished"/> + <translation>:</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="134"/> @@ -1264,13 +1115,13 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/networksettings.ui" line="210"/> <location filename="../src/mirall/networksettings.ui" line="306"/> <source>KBytes/s</source> - <translation type="unfinished"/> + <translation>KBytes/s</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="232"/> <location filename="../src/mirall/networksettings.ui" line="264"/> <source>No Limit</source> - <translation type="unfinished"/> + <translation>Χωρίς Όριο</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="258"/> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> - <translation type="unfinished"/> + <translation>Αποτυχία μετονομασίας φακέλου</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> - <translation type="unfinished"/> + <translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας φακέλου διότι ο φάκελος ή ένα αρχείο είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Επιτυχής δημιουργία τοπικού καταλόγου %1 για συγχρονισμό!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Απέτυχε να συνδεθεί με το %1 <1.br/>%2. </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Υπάρχει ήδη ο τοπικός κατάλογος %1 για συγχρονισμό, ρυθμίστε τον για συγχρονισμό.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Δημιουργία τοπικού καταλόγου %1 για συγχρονισμό... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>οκ</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>απέτυχε.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Δεν μπόρεσε να δημιουργήσει τοπικό φάκελλο %1 </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Η πρόσβαση στον απομακρυσμένο φάκελο ήταν αδύνατη! </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Σφάλμα %1 </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>δημιουργία φακέλλου στο ownCloud % 1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Ο απομακρυσμένος φάκελος %1 υπάρχει, ήδη. Πραγματοποιείτε σύνδεση για ενημέρωση. </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος! <br/> Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήρια. </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Η απομακρυσμένη δημιουργία φακέλου απέτυχε, επειδή πιθανώς τα διαπιστευτήρια που δόθηκαν είναι λάθος.</font><br/>Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Η απομακρυσμένη δημιουργία φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Μια σύνδεση συγχρονισμού από τον κατάλογο %1 σε %2 έχει συσταθεί. </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Η συνδεση πετυχε με %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Νέο αρχείο διαθέσιμο</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' συγχρονιστηκαν σε αυτη την συσκευη.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Νέα αρχεία διαθέσιμα</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' και %n αλλα αρχεια συγχρονιστηκαν σε αυτη την συσκευη.</numerusform><numerusform>'%1' and %n other file(s) have been synced to this machine.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Απομακρυνθηκε το αρχειο</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' μετακινηθηκε.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Αρχεια απομακρυνθηκαν</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' και %n αλλα αρχεια απομακρυνθηκαν.</numerusform><numerusform>'%1' και %n αλλα αρχεια απομακρυνθηκαν.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Το αρχειο ανανεωθηκε</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' ανανεωθηκε.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Τα αρχεια ανανεωθηκαν</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' και %n αλλα αρχειο(α) ανανεωθηκαν.</numerusform><numerusform>'%1' και %n αλλα αρχεια ανανεωθηκαν.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1651,7 +1439,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/settingsdialog.cpp" line="59"/> <source>Network</source> - <translation type="unfinished"/> + <translation>Δίκτυο</translation> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="70"/> @@ -1780,17 +1568,17 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudinfo.cpp" line="505"/> <source>Proxy Not Found</source> - <translation type="unfinished"/> + <translation>Δεν βρέθηκε διαμεσολαβητής</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="506"/> <source>The configured proxy could not be found. Please check the proxy settings.</source> - <translation type="unfinished"/> + <translation>Αδυναμία εύρεσης ρυθμισμένου διαμεσολαβητή. Παρακαλώ ελέγξτε τις ρυθμίσεις διαμεσολαβητή.</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="510"/> <source>Proxy Authentication Error</source> - <translation type="unfinished"/> + <translation>Σφάλμα πιστοποίησης διαμεσολαβητή</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="511"/> @@ -1800,12 +1588,12 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudinfo.cpp" line="515"/> <source>Proxy Connection Timed Out</source> - <translation type="unfinished"/> + <translation>Λήξη χρόνου σύνδεσης με διαμεσολαβητή</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="516"/> <source>The connection to the configured proxy has timed out.</source> - <translation type="unfinished"/> + <translation>Λήξη χρόνου σύνδεσης με τον ρυθμισμένο διαμεσολαβητή.</translation> </message> </context> <context> @@ -1835,7 +1623,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="110"/> <source>&Keep local data</source> - <translation type="unfinished"/> + <translation>&Διατήρηση τοπικών δεδομένων</translation> </message> <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="142"/> @@ -1860,7 +1648,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="243"/> <source>Status message</source> - <translation type="unfinished"/> + <translation>Μήνυμα κατάστασης</translation> </message> </context> <context> @@ -1873,17 +1661,17 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="38"/> <source>&Username</source> - <translation type="unfinished"/> + <translation>&Όνομα Χρήστη</translation> </message> <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="48"/> <source>&Password</source> - <translation type="unfinished"/> + <translation>&Συνθηματικό</translation> </message> <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="58"/> <source>Error Label</source> - <translation type="unfinished"/> + <translation>Εσφαλμένη Ετικέτα</translation> </message> <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="109"/> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Εισάγετε την url του ownCloud που θέλετε να συνδεθείτε (χωρίς http ή https)</translation> </message> @@ -1984,7 +1772,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="139"/> <source>&Keep local data</source> - <translation type="unfinished"/> + <translation>&Διατήρηση τοπικών δεδομένων</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="171"/> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Διακομιστής και Διεύθυνση </translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://..</translation> </message> @@ -2030,9 +1818,9 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> - <translation type="unfinished"/> + <translation>Εσφαλμένη Ετικέτα</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="393"/> @@ -2042,7 +1830,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="415"/> <source>Status message</source> - <translation type="unfinished"/> + <translation>Μήνυμα κατάστασης</translation> </message> </context> <context> @@ -2076,14 +1864,14 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/progressdispatcher.cpp" line="86"/> <location filename="../src/mirall/progressdispatcher.cpp" line="92"/> <source>downloading</source> - <translation type="unfinished"/> + <translation>λήψη</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="77"/> <location filename="../src/mirall/progressdispatcher.cpp" line="89"/> <location filename="../src/mirall/progressdispatcher.cpp" line="95"/> <source>uploading</source> - <translation type="unfinished"/> + <translation>αποστολή</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="37"/> @@ -2111,7 +1899,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/progressdispatcher.cpp" line="50"/> <source>Start</source> - <translation type="unfinished"/> + <translation>Έναρξη</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="53"/> @@ -2121,7 +1909,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/progressdispatcher.cpp" line="56"/> <source>For deletion</source> - <translation type="unfinished"/> + <translation>Προς διαγραφή</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="83"/> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> @@ -2223,7 +2011,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudtheme.cpp" line="99"/> <source>If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info.</source> <comment>Top text in setup wizard. Keep short!</comment> - <translation type="unfinished"/> + <translation>Εάν δεν έχετε ένα διακομιστή ownCloud, δείτε στην διεύθυνση <a href="https://owncloud.com">owncloud.com</a> για περισσότερες πληροφορίες.</translation> </message> </context> <context> diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index d1067bbbc..eea812a73 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -9,22 +9,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation type="unfinished"></translation> </message> @@ -37,32 +32,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> @@ -85,108 +75,98 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> @@ -211,50 +191,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -262,102 +242,102 @@ </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> - <source>Managed Folders:</source> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> - <source>Open folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> - <source>Quota n/a</source> + <location filename="../src/mirall/application.cpp" line="393"/> + <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> + <location filename="../src/mirall/application.cpp" line="396"/> + <source>Open folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="551"/> - <source>No items synced recently</source> + <location filename="../src/mirall/application.cpp" line="519"/> + <source>Quota n/a</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> - <source>%1 (%2, %3)</source> + <location filename="../src/mirall/application.cpp" line="552"/> + <source>No items synced recently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> - <source>Syncing %1 of %2 (%3 of %4) </source> + <location filename="../src/mirall/application.cpp" line="561"/> + <source>%1 (%2, %3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> + <location filename="../src/mirall/application.cpp" line="576"/> + <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation type="unfinished"></translation> </message> @@ -532,217 +512,136 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation type="unfinished"></translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"> <numerusform></numerusform> <numerusform></numerusform> </translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation type="unfinished"></translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation type="unfinished"></translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"></translation> </message> @@ -760,47 +659,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> @@ -809,7 +708,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"></translation> </message> @@ -838,7 +737,8 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> <translation type="unfinished"></translation> </message> </context> @@ -1034,186 +934,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation type="unfinished"></translation> </message> @@ -1411,17 +1265,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation type="unfinished"></translation> </message> @@ -1446,94 +1300,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"></translation> </message> @@ -1580,78 +1434,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation type="unfinished"></translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation type="unfinished"></translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation type="unfinished"></translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1660,7 +1442,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"></translation> </message> <message> @@ -1933,7 +1715,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> @@ -1987,7 +1769,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation type="unfinished"></translation> </message> @@ -2028,13 +1810,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation type="unfinished"></translation> </message> @@ -2050,7 +1832,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"></translation> </message> @@ -2227,12 +2009,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"></translation> </message> diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index f0fdb4082..2e50c1f43 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -7,22 +7,17 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Directorio de sincronización</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Seleccione una carpeta local en su ordenador para sincronizar:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Seleccionar...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>Nombre del alias del &Directorio:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Destino de la sincronización</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Seleccione una carpeta de destino</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Añadir carpeta</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> @@ -75,116 +65,106 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="20"/> <source>Account Maintenance</source> - <translation type="unfinished"/> + <translation>Mantenimiento de Cuenta</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="29"/> <source>Edit Ignored Files</source> - <translation type="unfinished"/> + <translation>Editar archivos ignorados</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> - <translation type="unfinished"/> + <translation>Modificar cuenta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> - <translation type="unfinished"/> + <translation>Sincronizar estado</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Añadir...</translation> + <translation>Conectar al <servidor> como <usuario></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Uso de Almacenamiento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> - <translation type="unfinished"/> + <translation>Obteniendo información de uso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source> - <translation type="unfinished"/> + <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirmar la eliminación de la carpeta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Comprobando conexión de %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <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="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>No se pudo conectar a %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Actualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>Sincronización %1 iniciada</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Salir</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Carpetas administradas:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Archivo %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>No hay carpetas de sincronización configuradas.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Texto de un etiqueta</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Archivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Conteo de archivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocolo de Sincronización</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Estado sin definir del directorio</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>El carpeta espera para comenzar la sincronización.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Determinando que archivos sincronizar</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Carpeta local %1 no existe.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Servidor no disponible actualmente.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 debería ser un directorio, pero no lo es.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Sincronización en curso.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 es ilegible.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Ultima sincronización fue un éxito</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Error de Sincronización</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Error de configuración.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Estado de Error sin Definir.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (último finalizado hace %n seg.)</numerusform><numerusform>%1 (últimos finalizados hace %n seg.)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (último finalizado hace %n min.)</numerusform><numerusform>%1 (últimos finalizados hace %n min.)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copiado al portapapeles</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>El protocolo de sincronzación ha sido copiado al portapapeles.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Archivos Sincronizados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nuevos Archivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Archivos Eliminados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Archivos Renombrados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Archivos Ignorados</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Errores</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflictos</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Subido</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Descargado</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Carpeta local %1 no existe.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 debería ser un directorio, pero no lo es.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 es ilegible.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Terminó el hilo Csync.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>Una antigua jornada sincronizada '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Esperando el inicio de la sincronización.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>La última sincronización fue exitosa.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Archivo</translation> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Asistente de carpetas de %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Texto de un etiqueta</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Estado de la carpeta no definido</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>La carpeta está esperando el inicio de la sincronización.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Sincronización en funcionamiento.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>La última sincronización fue exitosa.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Error de sincronización.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Error de configuración.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Fallo sin definir.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Registrar salida</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Buscar:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Encontrar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Limpia la pantalla de registros.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Gu&ardar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Guardar el archivo de registro a un archivo en disco para depuración.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Archivo '%1'<br/>no se puede abrir para escritura.<br/><br/>¡El archivo de registro <b>no</b> puede ser guardado!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Guardar archivo de registro</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>No se pudo escribir al archivo de registro</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Error Renombrando Carpeta</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>No es posible eliminar y salvaguardar la carpeta debido a que la carpeta o archivo en su interior está abierto por otro programa. Por favor cierre la carpeta o archivo y pulse reintentar o cancelar configuración.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Falló conectando con %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Creando la carpeta local %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>falló.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>No se pudo crear carpeta local %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>¡No se pudo acceder a la carpeta remota!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>creando carpeta en ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Carpeta remota %1 creada correctamente.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La carpeta remota %1 ya existe. Conectándola para sincronizar.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta causó un error HTTP de código %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y comprueba sus credenciales</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.</font><br/>Por favor, vuelva atrás y compruebe sus credenciales.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creación %1 de carpeta remota ha fallado con errores <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una conexión de sincronización desde %1 al directorio remoto %2 ha sido configurada.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>¡Conectado exitosamente a %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Conexión a %1 no se pudo establecer. Por favor compruebelo de nuevo.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Nuevo archivo disponible</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' se ha sincronizado en este equipo.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nuevos archivos disponibles</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' y %n otro archivo han sido sincronizados a esta máquina.</numerusform><numerusform>'%1' y %n otros archivos han sido sincronizados a esta máquina.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Archivo eliminado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' ha sido eliminado.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Archivos eliminados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' y %n otro archivo han sido eliminados.</numerusform><numerusform>'%1' y otros %n archivos han sido eliminados.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Archivo actualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' ha sido subido.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Archivos actualizados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' y %n otro archivo han sido subidos.</numerusform><numerusform>'%1' y %n otros archivos han sido subidos.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Etiqueta</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Introduzca la dirección URL de ownCloud a la cual desea conectarse (sin http o https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Dirección del servidor</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Etiquetado de Error</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Bandeja del sistema no está disponible</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>% 1 requiere en una bandeja del sistema de trabajo. Si está ejecutando XFCE, por favor siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instrucciones </ a>. De lo contrario, instale una aplicación de la bandeja del sistema, tales como "trayer 'y vuelva a intentarlo.</translation> </message> diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index 665dcad87..6cc6b31de 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -7,22 +7,17 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Directorio de sincronización</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Elegí un directorio local en tu computadora para sincronizar:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&CElegir...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Directorio Alias Nombre:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Destino de la sincronización</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Seleccioná un directorio de destino</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>gregar directorio</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Recargar</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Texto de la etiqueta</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Agregar sincronización</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Información...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirmá la eliminación del directorio</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Comprobando conexión de %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <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="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>No fue posible conectar a %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>Sincronización de %1 iniciada</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Salir</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Directorios administrados:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Directorio %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Los directorios de sincronización no están configurados.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>EtiquetaDeTexto</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Archivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Cantidad de archivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocolo de sincronización</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Estado del directorio, indefinido</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>El directorio está a la espera para poder sincronizarse.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Determinando qué archivos sincronizar</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>El directorio local %1 no existe.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>El servidor no está disponible actualmente.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 debería ser un directorio, pero no lo es.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>La sincronización se esta llevando a cabo.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>No se puede leer %1.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>La última sincronización fue satisfactoria.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Error de sincronización</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Error de configuración</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Error indefinido</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>uno: %1 (terminado por última vez %n seg. atrás)</numerusform><numerusform>otros: %1 (terminado por última vez %n seg. atrás)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>uno: %1 (terminado por última vez %n min. atrás)</numerusform><numerusform>otros: %1 (terminado por última vez %n min. atrás)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copiado al portapapeles</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>El protocolo de sincronización fue copiado al portapapeles.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Archivos sincronizados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nuevos archivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Archivos eliminados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Archivos renombrados</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Archivos ignorados</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Errores</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflictos</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Subido</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Descargado</translation> - </message> -</context> -<context> - <name>Mirall::Folder</name> - <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>El directorio local %1 no existe.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 debería ser un directorio, pero no lo es.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>No se puede leer %1.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>El proceso CSync finalizó.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Esperando el comienzo de la sincronización.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>La última sincronización fue exitosa.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Asistente de directorios</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Estado del directorio no definido</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>El directorio está esperando que empiece la sincronización.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Sincronización en funcionamiento.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>La última sincronización fue exitosa.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Error de sincronización.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Error de configuración.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Error no definido.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Contenido del log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Buscar:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Encontrar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Borrar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Limpiar la pantalla de registros.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>G&uardar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Guardar el log en un archivo en disco para depuración.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>El archivo '%1'<br/>no puede ser abierto para escritura.<br/><br/>¡El archivo de log <b>no</b> puede ser guardado!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Guardar archivo de log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>No fue posible escribir al archivo de log</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Error Al Renombrar Directorio</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>No es posible borrar y hacer una copia de seguridad del directorio porque el directorio o archivo en su interior está abierto por otro programa. Cerrá el directorio o archivo y pulsá Reintentar o Cancelar Configuración.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Directorio local %1 creado</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Error al conectar con %1: <br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Creando el directorio %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>aceptar</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>Error.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>No fue posible crear el directorio local %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>No fue posible acceder al directorio remoto!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>Creando carpeta en ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>El directorio remoto %1 fue creado con éxito.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación del directorio resultó en un error HTTP con código de error %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Error al crear el directorio remoto porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Fue creada una conexión de sincronización desde %1 al directorio remoto %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Conectado con éxito a %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Nuevo archivo disponible</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' fue sincronizado con esta computadora.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nuevos archivos disponibles</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' y otros %n archivo(s) han sido sincronizados con esta computadora.</numerusform><numerusform>'%1' y otros %n archivo(s) han sido sincronizados con esta computadora.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Archivo borrado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' fue borrado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Archivos eliminados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' y otros %n archivo(s) han sido removidos.</numerusform><numerusform>'%1' y otros %n archivo(s) han sido borrados.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Archivo actualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' ha sido actualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Archivos actualizados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' y otros %n archivo(s) han sido actualizados.</numerusform><numerusform>'%1' y otros %n archivo(s) han sido actualizados.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>EtiquetaDeTexto</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Escribí la URL del sistema ownCloud al que te querés conectar (sin http ni https)</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Dirección del servidor:</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://... </translation> @@ -2031,7 +1819,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Etiqueta de Error</translation> </message> @@ -2208,12 +1996,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>La bandeja del sistema no está disponible</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>% 1 requiere una bandeja del sistema funcionando. Si estás usando XFCE, por favor leé <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instrucciones</ a>. De lo contrario, instalá una aplicación de la bandeja del sistema, como 'trayer' e intentalo de nuevo.</translation> </message> diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 6eedfdce1..db35adb11 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -7,22 +7,17 @@ <translation>Vorm</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Sünkroniseeri kaust</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Vali kaust oma arvutist, mida sünkroniseerida:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Vali...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Kausta aliase nimi:</translation> </message> @@ -35,32 +30,27 @@ <translation>Vorm</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Sünkroniseerimise sihtkoht</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Vali sihtkataloog</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Lisa kaust</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Värskenda</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Kataloogid</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TekstiSilt</translation> </message> @@ -83,108 +73,98 @@ <translation>Redigeeri ignoreeritud faile</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Kustuta konto</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Muuda kontot</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Sünkroniseeringu staatus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Ühendatud <server> kasutajana <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Lisa sünkroniseerimine...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Paus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Eemalda</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Algseaded</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Mahu kasutus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Otsin kasutuse informatsiooni...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Taasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Kinnita kausta eemaldamist</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Kinnita kataloogi algseadistus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Kas soovid kindlasti algseadistada kataloogi <i>%1</i> ning uuesti luua oma kliendi andmebaasi?</p><p><b>Märkus:</b> Kuigi ühtegi faili ei kustutata, võib see põhjustada märkimisväärset andmeliiklust ning võtta aega mõnest minutist mõne tunnini sõltuvalt kataloogi suurusest.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>%1 ühenduse kontrollimine...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Ühtegi %1 ühendust pole seadistatud.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Sünkroniseerimine on käimas</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Ei õnnestunud ühenduda %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Hetkel</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Täielikult</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4 / %5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Täielikult lõpetatud.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Kasutad %1 sulle eraldatud mahust %2 </translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 sünkroniseerimine käivitati</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation><numerusform>Sünkroniseering alustatud %n seadistatud kataloogile.</numerusform><numerusform>Sünkroniseering alustatud %n seadistatud kataloogile.</numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Ava %1 brauseris</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Arvutan mahupiiri...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Tundmatu staatus</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Seaded...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Üksikasjad...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Abiinfo</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Lõpeta</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Pole.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Ava kohalik kataloog '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Hallatavad kaustad:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Ava kataloog '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Mahupiir n/a</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>Kasutatud %1% %2 </translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sünkroniseerin %1 / %2 (%3 / %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Kataloog %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Detailne Sync protokoll</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Tekstisilt</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Failid</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Falide arv</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopeeri</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Sünkroniseerimise protokoll</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Kataloogi staatus määratlemata.</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Kataloog on sünkroniseeringu ootel.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Ei suuda luua csync-konteksti</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Määratlen sünkroniseeritavaid faile.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Kohalikku kausta %1 pole olemas.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Server pole hetkel saadaval.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Sünkroniseerimine on käimas.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 pole loetav.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Viimane sünkroniseerimine oli edukas.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Sünkroniseerimise viga.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Paigalduse viga.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Tuvastamatu veaseisund.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (lõpetatud %n s. tagasi)</numerusform><numerusform>%1 (lõpetatud %n s. tagasi)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (lõpetatud %n min. tagasi)</numerusform><numerusform>%1 (lõpetatud %n min. tagasi)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Kopeeritud lõikepuhvrisse</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Sync protokoll on kopeeritud lõikepuhvrisse.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Sünkroniseeritud failid</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Uued failid</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Kustutatud failid</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Ümbernimetatud failid</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Ignoreeritud failid</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Vead</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Konfliktid</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Üles laetud</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Allalaetud</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Ei suuda luua csync-konteksti</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Kohalikku kausta %1 pole olemas.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 pole loetav.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync lõim katkestati.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎ Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki Oled kindel, et soovid seda operatsiooni teostada?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Kustutada kõik failid?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Kustutada kõik failid</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Säilita failid</translation> </message> @@ -752,47 +648,47 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Määramata staatus.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Ootab sünkroniseerimise alustamist.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Valmistun sünkroniseerima.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Sünkroniseerimine on käimas.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Server pole hetkel saadaval.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Viimane sünkroniseerimine oli edukas.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Seadistamise viga.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sünkroniseerimine on peatatud)</translation> </message> @@ -801,7 +697,7 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Fail</translation> </message> @@ -830,8 +726,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 kausta nõustaja</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1026,186 +923,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Tekstisilt</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Kataloog/Aeg</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Fail</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Tegevus</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Suurus</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Kopeeri</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Sünkroniseerimisprotokoll</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Määramata kausta staatus</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Kaust ootab sünkroniseerimise alustamist.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Server pole hetkel saadaval.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Sünkroniseerimine on käimas.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Viimane sünkroniseerimine oli edukas.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Sünkroniseerimise viga.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Seadistamise viga.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Määramata veastaatus.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>Faili ignoreeriti.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>Kataloog ingnoreeriti.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>Ignoreeritud.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Kopeeritud lõikepuhvrisse</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>Sync protokoll on kopeeritud lõikepuhvrisse.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Probleem: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Logi väljund</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>Ot&si:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>Leia:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Tühjenda</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Tühjenda näidatav logi.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&alvesta</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Salvesta logi fail kettale täpsemaks uurimiseks.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Faili '%1'<br/>ei saa kirjutamiseks avada.<br/><br/>Logi väljundit <b>ei saa</b> salvestada!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Salvesta logifail</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Logifaili kirjutamine ebaõnnestus</translation> </message> @@ -1403,17 +1254,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Kataloogi ümbernimetamine ebaõnnestus</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation> </message> @@ -1438,94 +1289,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Ühendumine ebaõnnestus %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Kohalik kataloog %1 on juba olemas. Valmistan selle ette sünkroniseerimiseks.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Kohaliku kausta %1 sünkroonimise loomine ... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>ebaõnnestus.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Ei suuda tekitada kohalikku kataloogi %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Serveri kataloogile ei ole ligipääsetav!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Viga: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>loon uue kataloogi ownCloudi: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Eemalolev kaust %1 on loodud.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Kausta tekitamine lõppes HTTP veakoodiga %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!<br/>Palun kontrolli oma kasutajatunnust ja parooli.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.</font><br/>Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Kataloogi %1 tekitamine serverisse ebaõnnestus veaga <tt>%2</tt></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Edukalt ühendatud %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti.</translation> </message> @@ -1572,69 +1423,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Uus fail on saadaval</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' sünkroniseeriti siia.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Uued failid on saadaval</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' ja %n fail(i) sünkroniseeriti siia.</numerusform><numerusform>'%1' ja %n fail(i) sünkroniseeriti siia.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Fail eemaldati</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' on eemaldatud.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Faili eemaldatud</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' ja %n fail(i) eemaldati.</numerusform><numerusform>'%1' ja %n fail(i) eemaldati.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Fail uuendatud</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' on uuendatud.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Failid uuendatud</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' ja %n fail(i) uuendati.</numerusform><numerusform>'%1' ja %n fail(i) uuendati.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1643,8 +1431,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1 Seaded</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1916,7 +1704,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Tekstisilt</translation> </message> @@ -1970,7 +1758,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Sisesta ühendatava ownCloud-i URL (ilma http või https-ita).</translation> </message> @@ -2011,13 +1799,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Serveri &Aadress</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2033,7 +1821,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Vea silt</translation> </message> @@ -2210,12 +1998,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Süsteemisalv pole saadaval</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 vajab tööks süsteemisalve. Kui Sa kasutad XFCE-d, palun järgi <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">neid juhiseid</a>. Muudel juhtudel palun paigalda süsteemisalve rakendus nagu näiteks 'trayer' ning proovi uuesti.</translation> </message> diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 4c58c9ab9..db64ba0a2 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -7,22 +7,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Sinkronizazio direktorioa</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Hautatu zure ordenagailuko karpeta lokala sinkronizatzeko:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Aukeratu...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Karpetaren ezizena:</translation> </message> @@ -35,32 +30,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Sinkronizazio helburua</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Hautatu helburu karpeta</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Gehitu Karpeta</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Birkargatu</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TestuEtiketa</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Gehitu sinkronizazioa...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausarazi</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Ezabatu</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Berrekin</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Baieztatu karpetaren ezabatzea</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Egiaztatzen %1 konexioa...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Ez dago %1 konexiorik konfiguratuta.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Sinkronizazioa martxan da</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>%1-era konektatzeak huts egin du: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Sinkronizazioa hasi da</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Laguntza</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Kendu</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Kudeatutako karpetak:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Ez dago sinkronizazio karpetarik definituta.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation type="unfinished"/> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Fitxategiak</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Fitxategi kopurua</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopiatu</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Sinkronizazio protokoloa</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Definitu gabeko karpeta egoera</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Karpetak sinkronizazioa hasteko itxoiten ari da.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Zein fitxategi sinkronizatu erabakitzen</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Bertako %1 karpeta ez da existitzen.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Zerbitzaria orain ez dago eskuragarri.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 karpeta bat izan behar zen baina ez da.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Sinkronizazioa martxan da.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 ezin da irakurri.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Azkeneko sinkronizazioa ongi egin zen.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Sinkronizazio errorea.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Konfigurazio errorea.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Definitu gabeko errore egoera.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Arbelera kopiatua</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Sinkronizazio protokoloa arbelera kopiatu da.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Sinkronizatutako Fitxategiak</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Fitxategi Berriak</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Ezabatutako Fitxategiak</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Berrizendatutako Fitxategiak</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Kontutan hartu gabeko Fitxategiak</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Erroreak</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Gatazkak</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Igoa</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Deskargatua</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Bertako %1 karpeta ez da existitzen.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 karpeta bat izan behar zen baina ez da.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 ezin da irakurri.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Errorea</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync haria bukatu da.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Definitu gabeko egoera.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Itxoiten sinkronizazioa hasteko.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Sinkronizazioa martxan da.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Konfigurazio errorea.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Karpeta Morroia</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Tamaina</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Definitu gabeko karpeta egoera.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Karpeta sinkronizazioa hasteko zain dago.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Sinkronizazioa martxan da.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Sinkronizazio errorea.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Konfigurazio errorea.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Definitu gabeko errore egoera.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Egunkari Irteera</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Bilatu:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Aurkitu:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Garbitu</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Garbitu egunkari bistaratzea.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&Gorde</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Gorde egunkari fitxategia fitxategi batean arazteko.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Errorea</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>'%1' Fitxategia<br/> ezin da idazteko ireki.<br/><br/>Egunkariaren irteera <b>ezin</b> da gorde!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Gorde egunkari fitxategia</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Ezin da egunkari fitxategia idatzi</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Huts %1 -era konektatzean:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Bertako sinkronizazio %1 karpeta sortzen...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ados</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>huts egin du.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Ezin da %1 karpeta lokala sortu</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Ezin da urruneko karpeta atzitu!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Errorea: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Urruneko %1 karpeta ongi sortu da.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Karpeta sortzeak HTTP %1 errore kodea igorri du</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>%1-era ongi konektatu da!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 konexioa ezin da ezarri. Mesedez egiaztatu berriz.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Fitxategi berria eskuragarri</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' makina honekin sinkronizatu da.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Fitxategi berriak eskuragarri</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' eta beste %n fitxategi makina honekin sinkronizatu dira.</numerusform><numerusform>'%1' eta beste %n fitxategi makina honekin sinkronizatu dira.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Fitxategia ezabatua</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' ezabatua izan da.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Fitxategiak ezabatuak</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' eta beste %n fitxategi ezabatu dira.</numerusform><numerusform>'%1' eta beste %n fitxategi ezabatu dira.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Fitxategia eguneratua</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' eguneratua izan da.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Fitxategiak eguneratuak</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' eta beste %n fitxategi eguneratu dira.</numerusform><numerusform>'%1' eta beste %n fitxategi eguneratu dira.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TestuEtiketa</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Sartu konektatu nahi duzun ownCloud zerbitzariaren urla (http edo https gabe).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Zerbitzari %helbidea</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index a22fc46fa..6521b3b4e 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -7,22 +7,17 @@ <translation>فرم</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>پوشه سینک</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>یک پوشه در کامپیوترتان انتخاب کنید تا سینک شود</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&انتخاب...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&پوشه نام مستعار</translation> </message> @@ -35,32 +30,27 @@ <translation>فرم</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>هدف همگام سازی</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>انتخاب یک پوشه مقصد</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>ایجاد پوشه</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>بازنمایی</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>برچسب متنی</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>توقف کردن</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>حذف</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>قبول کردن پاک شدن پوشه</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation> </message> @@ -209,150 +189,150 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 همگام سازی شروع شد.</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>راهنما</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>خروج</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>پوشه های مدیریت شده:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>پوشه %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>فرم</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>برچسب متنی</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>پروندهها</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>تعداد فایل</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>کپی کردن</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>پروتکل همگام سازی</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>وضعیت پوشه تعریف نشده است</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>پوشه برای شروع همگام سازی منتظر است.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>تعیین فایل ها برای همگام سازی.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>پوشه محلی %1 موجود نیست.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>در حال حاضر سرور در دسترس نیست.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 باید یک پوشه باشد اما نیست.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>همگام سازی در حال اجراست.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 قابل خواندن نیست.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>آخرین همگام سازی موفقیت آمیز بود.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>خطا هنگام همگام سازی.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>خطا در پیکربندی.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>خطای تعریف نشده.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (آخرین به پایان رسید %n ثانیه پیش)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (آخرین به پایان رسید %n دقیقه پیش)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>کپی به کلیپ بورد</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>پروتکل سنکرون شده است به کلیپ بورد کپی شده است.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>فایل های هماهنگ شده</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>فایل های جدید</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>فایلهای حذف شده</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>فایل های دوباره نام گذاری شده</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>فایل ها نادیده گرفته شده اند.</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>خطاها</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>ناسازگاری ها</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>بارگذاری شده است.</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>دریافت شده اند</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>پوشه محلی %1 موجود نیست.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 باید یک پوشه باشد اما نیست.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 قابل خواندن نیست.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>موقعیت تعریف نشده</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>صبر کنید تا همگام سازی آغاز شود</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>همگام سازی در حال اجراست</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>آخرین همگام سازی موفقیت آمیز بود</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>خطا در پیکر بندی.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,7 +723,8 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> <translation type="unfinished"/> </message> </context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>برچسب متنی</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>اندازه</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>وضعیت پوشه تعریف نشده</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>پوشه برای شروع همگام سازی منتظر است.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>همگام سازی در حال اجراست</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>آخرین همگام سازی موفقیت آمیز بود</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>همگام سازی با خطا مواجه شده است.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>خطا در پیکر بندی.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>خطای تعریف نشده.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&جستجو: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&پیدا کردن</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>معلوم</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&ذخیره سازی</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>خطا</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation type="unfinished"/> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>تغییر نام پوشه ناموفق بود</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>نمی توان پوشه را حذف کرد و از آن پشتیبان گرفت زیرا پوشه یا یک فایل در آن در برنامه دیگر باز است .لطفا پوشه یا فایل را ببندید و دوباره امتحان کنید یا راه اندازی را لغو کنید.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>ناموفق در اتصال به%1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. <br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>ایجاد پوشه همگام سازی محلی %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>خوب</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>ناموفق.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>نمی تواند پوشه محلی ایجاد کند %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>پوشه از راه دور نمی واند در دسترس باشد!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>خطا: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>ایجاد کردن پوشه بر روی ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!<br/>لطفا اعتبارهای خودتان را بررسی کنید.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red"> ایجاد پوشه از راه دور ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.</font><br/> لطفا باز گردید و اعتبار خود را بررسی کنید.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>ایجاد پوشه از راه دور %1 ناموفق بود با خطا <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>با موفقیت به %1 اتصال یافت!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>فایل جدید در دسترس قرار گرفت</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' با این دستگاه هماهمنگ شد.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>فایلهای جدید در دسترس هستند</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' و %n فایل(های) دیگر با این دستگاه هماهنگ شده اند.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>فایل حذف شد</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' بروز شد.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>فایل ها پاک شده اند</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' و %n فایل(های) دیگر حذف شدند.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>فایل به روز رسانی شده است.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' بروز شد.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>فایل های به روز رسانی شده اند</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' و %n فایل(های) دیگر بروز شدند.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>برچسب متنی</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>آدرس ownCloud را وارد کنید، شما می خواهید متصل شوید (بدون http یا https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>سرور& آدرس</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>برچسب خطا</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 4370ebeac..b7509c516 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -7,22 +7,17 @@ <translation>Lomake</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Synkronointikansio</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Valitse kansio paikalliselta koneelta, jonka haluat synkronoida:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Valitse...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Directory alias-nimi:</translation> </message> @@ -35,32 +30,27 @@ <translation>Lomake</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Synkronointikohde</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Valitse kohdekansio</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Lisää kansio</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Päivitä</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Kansiot</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Poista tili</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Muokkaa tiliä</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Synkronoinnin tila</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Lisää synkronointi...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Keskeytä</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Poista</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Tiedot...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Tilan käyttö</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Noudetaan käyttötietoja...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Jatka</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Vahvista kansion poisto</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Tarkistetaan %1-yhteyttä...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>%1-yhteyttä ei ole määritelty.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Synkronointi meneillään</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation>%1 %2 %3 (%4/%5)</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Avaa %1 selaimeen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Tuntematon tila</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Asetukset...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Tiedot...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Ohje</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Lopeta</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Viimeisimmät muutokset</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Avaa paikallinen kansio '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Hallitut kansiot:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Avaa kansio '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1%/%2 käytetty</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synkronoidaan %1/%2 (%3/%4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Kansio %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Synkronointikansioita ei ole määritetty.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TekstiLeima</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Paikallista kansiota %1 ei ole olemassa.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Tiedostot</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Tiedostomäärä</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 ei ole luettavissa.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Määrittämätön kansion tila</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Kansio odottaa synkronoinnin aloitusta.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Määritetään synkronoitavat tiedostot.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Palvelin ei ole juuri nyt käytettävissä.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Synkronointi on meneillään.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Viimeisin synkronointi valmistui onnistuneesti.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Synkronointivirhe.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Asetusvirhe.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Määrittämätön virheen tila.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (valmistui %n s sitten)</numerusform><numerusform>%1 (valmistui %n s sitten)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (valmistui %n min sitten)</numerusform><numerusform>%1 (valmistui %n min sitten)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Kopioitu leikepöydälle</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Synkronoidut tiedostot</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Uudet tiedostot</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Poistetut tiedostot</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Virheet</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Ristiriidat</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Lähetetty</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Ladattu</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Paikallista kansiota %1 ei ole olemassa.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 ei ole luettavissa.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Csyncin säikeen suoritus päättyi.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Poistetaanko kaikki tiedostot?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Poista kaikki tiedostot</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Säilytä tiedostot</translation> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Määrittelemätön tila.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Odottaa synkronoinnin alkamista.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Valmistellaan synkronointia.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Synkronointi on meneillään.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Palvelin ei ole käytettävissä.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Asetusvirhe.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synkronointi on keskeytetty)</translation> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Tiedosto</translation> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1-kansioavustaja</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TekstiLeima</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Tiedosto</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Toiminto</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Koko</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Määrittelemätön kansiotila</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Kansio odottaa synkronoinnin aloitusta.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Palvelin ei ole juuri nyt käytettävissä.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Synkronointi on meneillään.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Synkronointivirhe.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Asetusvirhe.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Määrittelemätön virhetila.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Kopioitu leikepöydälle</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Ongelma: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Loki</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Haku:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Etsi</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Tyhjennä</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Tyhjennä lokinäyttö.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&Tallenna</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Tallenna loki tiedostoon virheenetsintää varten.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Tiedostoa '%1'<br/>ei voida avata kirjoittamista varten.<br/><br/>Lokitulostusta<b>ei</b>pystytä tallentamaan!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Tallenna lokitiedosto</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Lokitiedostoon kirjoitus epäonnistui</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Kansion nimen muuttaminen epäonnistui</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Yhteys kohteeseen %1 epäonnistui:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Luodaan paikallista synkronointikansiota %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>epäonnistui.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Paikalliskansion %1 luonti epäonnistui</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Etäkansion käyttö epäonnistui!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>luodaan kansio ownCloudiin: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Etäkansio %1 luotiin onnistuneesti.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Kansion luonti aiheutti HTTP-virhekoodin %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Yhteys kohteeseen %1 muodostettiin onnistuneesti!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"/> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Uusi tiedosto saataville</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' on synkronoitu tälle koneelle.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Uusia tiedostoja saatavilla</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Tiedosto poistettu</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' on poistettu.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Tiedosto päivitetty</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' on päivitetty.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,8 +1428,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1-asetukset</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TekstiLeima</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Anna sen ownCloudin verkko-osoite, johon haluat yhdistää (ilman http- tai https-etuliitettä).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Palvelimen &osoite</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index dd7dece2d..f160904b5 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -7,22 +7,17 @@ <translation>Formulaire</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Répertoire synchronisé</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Spécifiez un répertoire local pour la synchronisation :</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Choisir</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>Alias utilisé pour ce &répertoire :</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulaire</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Cible pour la synchronisation</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Sélectioner un fichier cible </translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Ajouter le dossier</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>rafraichir</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>LabelTexte</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Ajouter une Synchronisation...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Mettre en pause</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Information...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Reprendre</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirmer le retrait du dossier</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Vérification de la connexion à %1 </translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Aucune connexion à %1 configurée</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Echec de connexion à %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Synchronisation démarrée </translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Aide</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Quitter</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Répertoires suivis :</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Dossier %1 : %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Aucun répertoire synchronisé n'est configuré.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Zone de texte</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Fichiers</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Nombre de fichiers</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copier</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocole de Synchronisation</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>État du dossier indéfini</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Le dossier est en attente de synchronisation</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Identification des fichiers à synchroniser.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Le dossier local %1 n'existe pas.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Le serveur est indisponible pour le moment.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 doit être un répertoire, mais ce n'en ai pas un.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>La synchronisation est en cours.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 ne peut pas être lu.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>La dernière synchronisation s'est effectuée avec succès.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Erreur de synchronisation.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Erreur de configuration.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Erreur de type inconnu.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (achevé il y a %n sec.)</numerusform><numerusform>%1 (achevé il y a %n sec.)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (achevé il y a %n min.)</numerusform><numerusform>%1 (achevé il y a %n min.)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copié dans le presse-papiers</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Le protocole choisi pour la synchronisation a été copié dans le presse-papiers.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Fichiers synchronisés</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nouveaux fichiers</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Fichiers effacés</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Fichiers renommés</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Fichiers ignorés</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Erreurs</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflits</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Importé</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Téléchargé</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Le dossier local %1 n'existe pas.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 doit être un répertoire, mais ce n'en ai pas un.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 ne peut pas être lu.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Le processus CSync s'est terminé.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Statut indéfini.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>En attente de synchronisation .</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>La synchronisation est en cours.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Dernière synchronisation effectuée avec succès</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Assistant de configuration pour le dossier %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Zone de texte</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Statut du dossier indéfini</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Le dossier attend sa synchronisation.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>La synchronisation est en cours.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Dernière synchronisation effectuée avec succès</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Erreur de synchronisation.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Erreur d'installation.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Status d'erreur indéfini</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Consigner la sortie dans des fichiers de log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Recherche :</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Chercher</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Effacer</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Effacer la fenêtre de logs.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&auvegarder</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Enregistrer le fichier de log sur le disque à des fins de débogage.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Le fichier '%1'<br/>ne peut être ouvert en écriture.<br/><br/>La sortie <b>ne peut pas</b> être consignée dans un fichier de log !</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Sauvegarder le fichier de log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Impossible d'écrire dans le fichier de log</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Echec du renommage du dossier</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Ne peut supprimer et sauvegarder le dossier parce que le dossier ou le fichier concerné est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et taper ré-essayer ou annuler l'installation.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Échec de la connexion à %1 :<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Création du dossier de synchronisation local %1 …</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>échoué.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Impossible de créer le répertoire local %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Impossible d'accéder au répertoire distant !</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>création d'un répertoire sur ownCloud : %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Le dossier distant %1 a été créé avec succès.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Le dossier distant %1 existe déjà. Veuillez vous y connecter pour la synchronisation.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La création du dossier a généré le code d'erreur HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La création du répertoire distant a échoué car les identifiants de connexion sont erronés !<br/>Veuillez revenir en arrière et vérifier ces derniers.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La création du dossier distant a échoué probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir à l'étape précédente et vérifier vos informations d'identification.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Connecté avec succès à %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connexion à %1 n'a pu être établie. Essayez encore svp.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Nouveau fichier disponible</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' a été synchronisé sur cette machine.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nouveaux fichiers disponibles</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' et %n autre(s) fichier(s) ont été synchronisés avec cette machine.</numerusform><numerusform>'%1' et %n autre(s) fichier(s) ont été synchronisés avec cette machine.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Fichier supprimé</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' a été supprimé.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Fichiers supprimés</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' et %n autre(s) fichier(s) ont été supprimés.</numerusform><numerusform>'%1' et %n autre(s) fichier(s) ont été supprimés.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Fichier mis à jour</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' a été mis à jour.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Fichiers mis à jour</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' et %n autre(s) fichiers(s) ont été mis à jour.</numerusform><numerusform>'%1' et %n autre(s) fichiers(s) ont été mis à jour.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Zone de texte</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Veuillez saisir l'url du serveur ownCloud auquel vous souhaitez vous connecter (sans http ni https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Adresse du serveur</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Message d'erreur</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Zone de notification non disponible</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index b2fb8b2f5..1813cc3e0 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -7,22 +7,17 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Directorio de sincronización</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Escolla un cartafol local no seu computador para sincronizar:</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Escoller...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>Alcume do &directorio:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulario</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Destino da sincronización</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Seleccione o cartafol de destino</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Engadir un cartafol</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Cartafoles</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> @@ -83,108 +73,98 @@ <translation>Editar ficheiros ignorados</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Retirar a conta</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Modificar a conta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Estado da sincronización</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Engadir sincronización...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausa</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Restabelecer</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Información...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Uso do almacenamento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Recuperando información de uso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirmar a eliminación do cartafol</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Confirmar o restabelecemento do cartafol</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</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> Se ben non será retirado ningún ficheiro, isto pode provocar un tráfico significativo de datos e levar bastante tempo, ata horas, dependendo do tamaño do cartafol.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Comprobando a conexión %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Non se configurou a conexión %1.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Non foi posíbel conectar con %1:<tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Actual</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Completado</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Totalmente terminada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Esta a usar %1 do seu almacenamento dispoñíbel de %2.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>Comezou a sincronización %1</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation><numerusform>Comezou a sincronización para %n cartafol con sincronización configurada.</numerusform><numerusform>Comezou a sincronización para %n cartafoles con sincronización configurada.</numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Abrir %1 nun navegador</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Calculando a cota...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Estado descoñecido</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Axustes...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Axuda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Saír</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Nada.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Cambios recentes</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Abrir o cartafol local «%1»</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Cartafoles xestionados:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Abrir o cartafol «%1»</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Cota n/d</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>Usado %1% de %2</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Non hai elementos sincronizados recentemente</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizando %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>Sincronizandose</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Cartafol %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Non se configuraron cartafoles de sincronización.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Protocolo de sincronización detallado</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Ficheiros</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Contador de ficheiros</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocolo de sincronización</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Estado do cartafol sen definir</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>O cartafol agarda a comezar a sincronización.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Non é posíbel crear o contexto csync</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Determinar os ficheiros a sincronizar.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>O cartafol local %1 non existe.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>O servidor non está dispoñíbel actualmente.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 debería ser un directorio e non o é.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Estase sincronizando.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 non é lexíbel.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>A última sincronización fíxose correctamente.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Produciuse un erro de sincronización.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Produciuse un erro de configuración.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Estado de erro sen definir.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (o último rematou vai %n seg.)</numerusform><numerusform>%1 (os últimos remataron vai %n seg.)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (o último rematou vai %n min.)</numerusform><numerusform>%1 (os últimos remataron vai %n min.)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copiado no portapapeis.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>O protocolo de sincronización foi copiado no portapapeis.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Ficheiros sincronizados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Ficheiros novos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Ficheiros eliminados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Ficheiros renomeados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Ficheiros ignorados</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Erros</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflitos</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Enviado</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Descargado</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Non é posíbel crear o contexto csync</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>O cartafol local %1 non existe.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 debería ser un directorio e non o é.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 non é lexíbel.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Rematou o fío en CSync.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1». Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu Confirma que quere realizar esta operación?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Retirar todos os ficheiros?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Manter os ficheiros</translation> </message> @@ -752,47 +648,47 @@ Confirma que quere realizar esta operación?</translation> <translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Estado sen definir.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Agardando polo comezo da sincronización.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Preparando para sincronizar.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Estase sincronizando.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>O servidor non está dispoñíbel actualmente.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (sincronización en pausa)</translation> </message> @@ -801,7 +697,7 @@ Confirma que quere realizar esta operación?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Ficheiro</translation> </message> @@ -832,8 +728,9 @@ fiábel. Revise a documentación para posíbeis arranxos.</translation> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Asistente de cartafol %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1030,186 +927,140 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Cartafol/hora</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Protocolo de sincronización</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Estado do cartafol non definido</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>O cartafol agarda a comezar a sincronización.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Determinar os ficheiros a sincronizar.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>O servidor non está dispoñíbel actualmente.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Estase sincronizando.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>A última sincronización fíxose correctamente.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Erro de sincronización.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Erro de configuración.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>A sincronización foi correcta, mais con algún aviso en ficheiros individuais.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Estado de erro sen definir.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>Ficheiro ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>Directorio ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>Ligazón branda ignorada.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>Ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Copiado no portapapeis.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>O protocolo de sincronización foi copiado no portapapeis.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problema: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Rexistro da saída</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Buscar:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Atopar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Limpar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Limpar a saída de rexistro.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&Gardar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Gardar o ficheiro de rexistro a un ficheiro no disco para depuración.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>O ficheiro «%1»<br/> non se pode abrir para escritura.<br/><br/>A saída do rexistro <b>non</n> se pode gardar!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Gardar o ficheiro de rexistro</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Non foi posíbel escribir no ficheiro de rexistro</translation> </message> @@ -1407,17 +1258,17 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Non foi posíbel renomear o cartafol</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Non é posíbel retirar ou facer copias de seguranza do cartafol ou dun ficheiro que estea aberto noutro programa. Peche o cartafol ou o ficheiro e prema en tentar de novo ou cancele o proceso.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation> </message> @@ -1442,94 +1293,94 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <translation>Non foi posíbel conectar con %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>Erro: Credenciais incorrectas.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Creando un cartafol local de sincronización %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>aceptar</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>fallou.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Non foi posíbel crear o cartafol local %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>O cartafol remoto non é accesíbel!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>creando o cartafol en ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>O cartafol remoto %1 creouse correctamente.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A creación do cartafol resultou nun código de erro HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A creación do cartafol remoto fracasou por por de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volva atrás e comprobe as súas credenciais.</p> </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Conectou satisfactoriamente con %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation> </message> @@ -1576,69 +1427,6 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Novo ficheiro dispoñíbel</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>«%1» foi sincronizado con esta máquina.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Novos ficheiros dispoñíbeis</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>«%1» e outro ficheiro foi sincronizado con esta máquina.</numerusform><numerusform>«%1» e outros %n ficheiros foron sincronizados con esta máquina.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Ficheiro retirado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>«%1» foi retirado.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Ficheiros retirados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>«%1» e outro ficheiro foi retirado.</numerusform><numerusform>«%1» e outros %n ficheiros foron retirados.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Ficheiro actualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>«%1» foi actualizado.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Ficheiros actualizados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>«%1» e outro ficheiro foi actualizado.</numerusform><numerusform>«%1» e outros %n ficheiros foron actualizados.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1647,8 +1435,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>Xustes de %1</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1920,7 +1708,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> @@ -1974,7 +1762,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Introduza o URL de ownCloud se quere conectarse a (sen o http ou https).</translation> </message> @@ -2015,13 +1803,13 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Enderezo do servidor</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2037,7 +1825,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Etiqueta de erro</translation> </message> @@ -2214,12 +2002,12 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Área de notificación non dispoñíbel</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 require dunha área de notificación. Se está executando XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">estas instrucións</a>. Senón, instale un aplicativo de área de notificación como «trayer» e ténteo de novo.</translation> </message> diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index f98ece34d..c3c94ce9b 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -7,22 +7,17 @@ <translation>Űrlap</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Szinkronizálási könyvtár</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>A szinkronizáláshoz válasszon ki egy helyi mappát a számítógépén:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Kiválasztás...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Könyvtár alias neve:</translation> </message> @@ -35,32 +30,27 @@ <translation>Űrlap</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Szinkronicációs cél</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Mappa hozzáadása</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Frissítés</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> - <translation type="unfinished"/> + <translation>Mappák</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -75,116 +65,106 @@ <message> <location filename="../src/mirall/accountsettings.ui" line="20"/> <source>Account Maintenance</source> - <translation type="unfinished"/> + <translation>Fiókkarbantartás</translation> </message> <message> <location filename="../src/mirall/accountsettings.ui" line="29"/> <source>Edit Ignored Files</source> - <translation type="unfinished"/> + <translation>Kihagyott fájlok szerkesztése</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> - <translation type="unfinished"/> + <translation>Fiók módosítása</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> - <translation type="unfinished"/> + <translation>Szinkronizálási állapot</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Szünet</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Eltávolítás</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Információ</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> - <translation type="unfinished"/> + <translation>Tárhelyhasználat</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> - <translation type="unfinished"/> + <translation>Folytatás</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <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="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Szinkronizálás fut</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"/> </message> @@ -201,7 +181,7 @@ <message> <location filename="../src/mirall/accountsettings.cpp" line="440"/> <source>unknown problem.</source> - <translation type="unfinished"/> + <translation>ismeretlen probléma.</translation> </message> <message> <location filename="../src/mirall/accountsettings.cpp" line="443"/> @@ -209,150 +189,150 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> - <translation type="unfinished"/> + <translation>Teljesen befejezve.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 szinkronizálás elindult</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> - <translation type="unfinished"/> + <translation>Kvóta kiszámítása...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> - <translation type="unfinished"/> + <translation>Ismeretlen állapot</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> - <translation type="unfinished"/> + <translation>Beállítások...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> - <translation type="unfinished"/> + <translation>Részletek...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Súgó</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Kilépés</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation>Legutóbbi változások</translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Kezelt mappák:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> - <translation type="unfinished"/> + <translation>Kvóta n/a</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> - <translation type="unfinished"/> + <translation>Mappa %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Nincsenek megadva szinkronizálandó mappák.</translation> </message> @@ -527,213 +507,129 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Űrlap</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation type="unfinished"/> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Fájlok</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Fájlok száma</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Másol</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Szinkronizációs protokoll</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>%1 helyi mappa nem létezik.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Ismeretlen könyvtár állapot</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 könyvtár kell legyen, de nem az.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>A könyvtár a szinkronizációra vár.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 nem olvasható.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>A kiszolgáló nem elérhető.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>A szinkronizálás fut.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>A legutolsó szinkronizálás sikeres volt.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Szinkronizálási hiba.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Beállítási hiba</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Ismeretlen hibaállapot.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Bemásolva a vágólapra</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>A sync protokoll bemásolva a vágólapra.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Szinkronizált fájlok</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Új fájlok</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Törölt fájlok</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Átnevezett fájlok</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Kihagyott fájlok</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Hibák</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Konfliktusok</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Feltöltve</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Letöltve</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>%1 helyi mappa nem létezik.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 könyvtár kell legyen, de nem az.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 nem olvasható.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> - <translation type="unfinished"/> + <translation>El legyen távolítva az összes fájl?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> - <translation type="unfinished"/> + <translation>Összes fájl eltávolítása</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> - <translation type="unfinished"/> + <translation>Fájlok megtartása</translation> </message> </context> <context> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> - <translation type="unfinished"/> + <translation>Ismeretlen állapot.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Várakozás a szinkronizálás elindítására.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> - <translation type="unfinished"/> + <translation>Előkészítés szinkronizációhoz.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Szinkronizálás fut.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> - <translation type="unfinished"/> + <translation>A kiszolgáló jelenleg nem érhető el.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Legutolsó szinkronizálás sikeres volt.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Beállítás hiba.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,9 +694,9 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> - <translation type="unfinished"/> + <translation>Fájl</translation> </message> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="200"/> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 könyvtár varázsló</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -836,7 +733,7 @@ documentation for possible fixes.</source> <message> <location filename="../src/mirall/folderwizard.cpp" line="74"/> <source>No local folder selected!</source> - <translation type="unfinished"/> + <translation>Nincs helyi mappa kiválasztva!</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="79"/> @@ -879,12 +776,12 @@ documentation for possible fixes.</source> <message> <location filename="../src/mirall/folderwizard.cpp" line="191"/> <source>Add Remote Folder</source> - <translation type="unfinished"/> + <translation>Távoli mappa hozzáadása</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="192"/> <source>Enter the name of the new folder:</source> - <translation type="unfinished"/> + <translation>Adja meg az új mappa nevét:</translation> </message> <message> <location filename="../src/mirall/folderwizard.cpp" line="211"/> @@ -938,7 +835,7 @@ documentation for possible fixes.</source> <message> <location filename="../src/mirall/generalsettings.ui" line="40"/> <source>Use Monochrome Icons</source> - <translation type="unfinished"/> + <translation>Monokróm ikonok használata</translation> </message> <message> <location filename="../src/mirall/generalsettings.ui" line="50"/> @@ -974,7 +871,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/ignorelisteditor.cpp" line="97"/> <source>Could not open file</source> - <translation type="unfinished"/> + <translation>Nem sikerült a fájl megnyitása</translation> </message> <message> <location filename="../src/mirall/ignorelisteditor.cpp" line="98"/> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> - <translation type="unfinished"/> + <translation>Fájl</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> - <translation type="unfinished"/> + <translation>Művelet</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Méret</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> - <translation type="unfinished"/> + <translation>Másolás</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Nem definiált könyvtár állapot.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>A könyvtár várakozik a szinkronizálás elindítására.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Szinkronizálás fut.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Legutolsó szinkronizálás sikeres volt.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Szinkronizálás hiba.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Beállítás hiba.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> + <translation>Szinkronizációs protokoll</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> - <translation type="unfinished"/> + <translation>Fájl ignorálva.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> - <translation type="unfinished"/> + <translation>Mappa ignorálva.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> - <translation type="unfinished"/> + <translation>Szoftlink ignorálva.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> - <translation type="unfinished"/> + <translation>Ignorálva.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> - <translation type="unfinished"/> + <translation>Bemásolva a vágólapra</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> + <translation>Probléma: %1</translation> + </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Kimenet naplózása</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Keresés: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Keres</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Törlés</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Törölje a naplózás kimenetét.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>M&entés</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>A naplófájl mentése a helyi gépre.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>'%1' fájlt<br/>nem lehet írásra megnyitni.<br/><br/>A naplózás kimenete <b>nem</b> menthető!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Naplófájl mentése</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>A naplófájl írása sikertelen </translation> </message> @@ -1217,17 +1068,17 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/networksettings.ui" line="23"/> <source>Proxy Settings</source> - <translation type="unfinished"/> + <translation>Proxy beállítások</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="29"/> <source>No Proxy</source> - <translation type="unfinished"/> + <translation>Nincs proxy</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="42"/> <source>Use system proxy</source> - <translation type="unfinished"/> + <translation>Rendszerproxy használata</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="52"/> @@ -1252,7 +1103,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/networksettings.ui" line="182"/> <source>Download Bandwidth</source> - <translation type="unfinished"/> + <translation>Letöltési sávszélesség</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="188"/> @@ -1264,18 +1115,18 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/networksettings.ui" line="210"/> <location filename="../src/mirall/networksettings.ui" line="306"/> <source>KBytes/s</source> - <translation type="unfinished"/> + <translation>KBájt/mp</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="232"/> <location filename="../src/mirall/networksettings.ui" line="264"/> <source>No Limit</source> - <translation type="unfinished"/> + <translation>Nincs limit</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="258"/> <source>Upload Bandwidth</source> - <translation type="unfinished"/> + <translation>Feltöltési sávszélesség</translation> </message> <message> <location filename="../src/mirall/networksettings.ui" line="271"/> @@ -1300,12 +1151,12 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/networksettings.cpp" line="37"/> <source>HTTP(S) proxy</source> - <translation type="unfinished"/> + <translation>HTTP(S) proxy</translation> </message> <message> <location filename="../src/mirall/networksettings.cpp" line="38"/> <source>SOCKS5 proxy</source> - <translation type="unfinished"/> + <translation>SOCKS5 proxy</translation> </message> </context> <context> @@ -1313,7 +1164,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="47"/> <source>Connect to %1</source> - <translation type="unfinished"/> + <translation>Kapcsolódás ehhez: %1</translation> </message> <message> <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="48"/> @@ -1356,7 +1207,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudhttpcredspage.cpp" line="41"/> <source>Connect to %1</source> - <translation type="unfinished"/> + <translation>Kapcsolódás ehhez: %1</translation> </message> <message> <location filename="../src/wizard/owncloudhttpcredspage.cpp" line="42"/> @@ -1374,12 +1225,12 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudsetuppage.cpp" line="43"/> <source>Connect to %1</source> - <translation type="unfinished"/> + <translation>Kapcsolódás ehhez: %1</translation> </message> <message> <location filename="../src/wizard/owncloudsetuppage.cpp" line="44"/> <source>Setup ownCloud server</source> - <translation type="unfinished"/> + <translation>ownCloud kiszolgáló telepítése</translation> </message> <message> <location filename="../src/wizard/owncloudsetuppage.cpp" line="100"/> @@ -1394,23 +1245,23 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudsetuppage.cpp" line="230"/> <source>Update ownCloud server</source> - <translation type="unfinished"/> + <translation>ownCloud kiszolgáló frissítése</translation> </message> </context> <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> - <translation type="unfinished"/> + <translation>A mappa átnevezése nem sikerült</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Kapcsolódási hiba %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>A helyi %1 mappa már létezik, állítsa be a szinkronizálódását.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Helyi %1 szinkronizációs mappa létrehozása...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation> sikertelen.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> - <translation type="unfinished"/> + <translation>Hiba: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>%1 távoli nappa sikeresen létrehozva.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A %1 távoli mappa már létezik. Csatlakoztassa a szinkronizációhoz.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A könyvtár létrehozásakor keletkezett HTTP hibakód %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">A távoli mappa létrehozása sikertelen, valószínűleg mivel hibásak a megdott hitelesítési adatok.</font><br/>Lépjen vissza és ellenőrizze a belépési adatokat.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A távoli %1 mappa létrehozása nem sikerült. Hibaüzenet: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A szinkronizációs kapcsolat a %1 és a %2 távoli mappa között létrejött.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Sikeresen csatlakozva: %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>A kapcsolat a %1 kiszolgálóhoz sikertelen. Ellenőrizze újra.</translation> </message> @@ -1537,7 +1388,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudwizard.cpp" line="148"/> <source>Connect...</source> - <translation type="unfinished"/> + <translation>Csatlakozás...</translation> </message> </context> <context> @@ -1545,12 +1396,12 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudwizardresultpage.cpp" line="51"/> <source>Open %1</source> - <translation type="unfinished"/> + <translation>%1 megnyitása</translation> </message> <message> <location filename="../src/wizard/owncloudwizardresultpage.cpp" line="43"/> <source>Open Local Folder</source> - <translation type="unfinished"/> + <translation>Helyi mappa megnyitása</translation> </message> <message> <location filename="../src/wizard/owncloudwizardresultpage.cpp" line="39"/> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Új fájl érhető el.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' szinkronizálva a számítógépre.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Új fájlok érhetőek el</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' és %n további fájl szinkronizálva erre a számítógépre.</numerusform><numerusform>'%1' és %n további fájl szinkronizálva erre a számítógépre.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Fájl törölve</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' törölve.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Fájlok törölve</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' és %n további fájl törölve.</numerusform><numerusform>'%1' és %n további fájl törölve.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Fájl feltöltve</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' frissítve.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Fájlok feltöltve</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' és %n további fájl frissítve.</numerusform><numerusform>'%1' és %n további fájl frissítve.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1651,12 +1439,12 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/settingsdialog.cpp" line="59"/> <source>Network</source> - <translation type="unfinished"/> + <translation>Hálózat</translation> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="70"/> <source>Account</source> - <translation type="unfinished"/> + <translation>Fiók</translation> </message> </context> <context> @@ -1732,7 +1520,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/updatedetector.cpp" line="112"/> <source>New Version Available</source> - <translation type="unfinished"/> + <translation>Új verzió érhető el</translation> </message> <message> <location filename="../src/mirall/updatedetector.cpp" line="118"/> @@ -1742,17 +1530,17 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/updatedetector.cpp" line="130"/> <source>Skip update</source> - <translation type="unfinished"/> + <translation>Frissítés kihagyása</translation> </message> <message> <location filename="../src/mirall/updatedetector.cpp" line="131"/> <source>Skip this time</source> - <translation type="unfinished"/> + <translation>Kihagyás ezalkalommal</translation> </message> <message> <location filename="../src/mirall/updatedetector.cpp" line="132"/> <source>Get update</source> - <translation type="unfinished"/> + <translation>Frissítés beszerzése</translation> </message> </context> <context> @@ -1760,7 +1548,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudinfo.cpp" line="495"/> <source>Proxy Refused Connection </source> - <translation type="unfinished"/> + <translation>A proxy</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="496"/> @@ -1780,7 +1568,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudinfo.cpp" line="505"/> <source>Proxy Not Found</source> - <translation type="unfinished"/> + <translation>A proxy nem található</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="506"/> @@ -1790,7 +1578,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudinfo.cpp" line="510"/> <source>Proxy Authentication Error</source> - <translation type="unfinished"/> + <translation>Proxy authentikációs hiba</translation> </message> <message> <location filename="../src/mirall/owncloudinfo.cpp" line="511"/> @@ -1825,7 +1613,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="72"/> <source>&Local Folder</source> - <translation type="unfinished"/> + <translation>&Helyi mappa</translation> </message> <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="88"/> @@ -1860,7 +1648,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="243"/> <source>Status message</source> - <translation type="unfinished"/> + <translation>Állapotüzenet</translation> </message> </context> <context> @@ -1873,12 +1661,12 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="38"/> <source>&Username</source> - <translation type="unfinished"/> + <translation>&Felhasználónév</translation> </message> <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="48"/> <source>&Password</source> - <translation type="unfinished"/> + <translation>&Jelszó</translation> </message> <message> <location filename="../src/wizard/owncloudhttpcredspage.ui" line="58"/> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1967,14 +1755,14 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Írja be az ownCloud kiszolgáló nevét amihez kapcsolódni szeretne (http és https nélkül).</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="107"/> <source>&Local Folder</source> - <translation type="unfinished"/> + <translation>&Helyi mappa</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="123"/> @@ -2008,41 +1796,41 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> - <translation type="unfinished"/> + <translation>Kiszolgáló &címe</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> - <translation type="unfinished"/> + <translation>https://...</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="280"/> <source>&Username</source> - <translation type="unfinished"/> + <translation>&Felhasználónév</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="309"/> <source>&Password</source> - <translation type="unfinished"/> + <translation>&Jelszó</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="393"/> <source>Advanced &Settings</source> - <translation type="unfinished"/> + <translation>Haladó &beállítások</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="415"/> <source>Status message</source> - <translation type="unfinished"/> + <translation>Állapotüzenet</translation> </message> </context> <context> @@ -2089,7 +1877,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/progressdispatcher.cpp" line="37"/> <location filename="../src/mirall/progressdispatcher.cpp" line="80"/> <source>Context</source> - <translation type="unfinished"/> + <translation>Kontextus</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="31"/> @@ -2106,7 +1894,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/progressdispatcher.cpp" line="40"/> <source>Inactive</source> - <translation type="unfinished"/> + <translation>Inaktív</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="50"/> @@ -2116,17 +1904,17 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/progressdispatcher.cpp" line="53"/> <source>Finished</source> - <translation type="unfinished"/> + <translation>Befejezve</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="56"/> <source>For deletion</source> - <translation type="unfinished"/> + <translation>Törlendő</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="83"/> <source>inactive</source> - <translation type="unfinished"/> + <translation>inaktív</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="98"/> @@ -2136,7 +1924,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/progressdispatcher.cpp" line="101"/> <source>finished</source> - <translation type="unfinished"/> + <translation>befejezve</translation> </message> <message> <location filename="../src/mirall/progressdispatcher.cpp" line="104"/> @@ -2196,7 +1984,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/sslerrordialog.ui" line="25"/> <source>Trust this certificate anyway</source> - <translation type="unfinished"/> + <translation>Mindenképp fogadja el ezt a tanúsítványt</translation> </message> <message> <location filename="../src/mirall/sslerrordialog.ui" line="44"/> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index 76ff3b631..348aa1d13 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -7,22 +7,17 @@ <translation>Modulo</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Sincronizza cartella</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Scegli una cartella sul tuo computer da sincronizzare:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>S&cegli...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>Alias della car&tella:</translation> </message> @@ -35,32 +30,27 @@ <translation>Modulo</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Destinazione sincronizzazione</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Seleziona una cartella di destinazione</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Aggiungi cartella</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Aggiorna</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Cartelle</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> @@ -83,108 +73,98 @@ <translation>Modifica file ignorati</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Rimuovi account</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Modifica account</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Stato di sincronizzazione</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Connesso a <server> come <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Aggiugi sincronizzazione...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausa</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Ripristina</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Informazioni...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Utilizzo archiviazione</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Recupero delle informazioni di utilizzo in corso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Riprendi</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Conferma la rimozione della cartella</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Conferma il ripristino della cartella</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> anche se nessun file sarà rimosso, questa operazione causerà un significativo traffico di dati e richiederà diversi minuti oppure ore, in base alla dimensione della cartella.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Controllo della connessione di %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Nessuna connessione di %1 configurata.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Connessione a %1 non riuscita: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Avvia</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Attualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Terminata completamente.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Stai utilizzando %1 dell'archiviazione disponibile di %2.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Sincronizzazione iniziata</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Apri %1 nel browser...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Calcolo quota in corso...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Stato sconosciuto</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Impostazioni...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Dettagli...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Esci</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Nessuna.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Modifiche recenti</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Apri la cartella locale '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Cartelle gestite:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Apri la cartella '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Quota n/d</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% di %2 utilizzati</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Nessun elemento sincronizzato di recente</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <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/application.cpp" line="597"/> - <source>In Sync</source> - <translation>In sincronizzazione</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Cartella %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Nessuna cartella configurata per la sincronizzazione.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Protocollo di sincronizzazione dettagliato</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>File</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Numero file</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copia</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocollo di sincronizzazione</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Stato della cartella non definito</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>La cartella è in attesa di sincronizzazione.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Impossibile creare il contesto csync</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Individuazione dei file da sincronizzare.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>La cartella locale %1 non esiste.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Il server è attualmente non disponibile.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 dovrebbe essere una cartella.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Sincronizzazione in corso.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 non è leggibile.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>L'ultima sincronizzazione è avvenuta correttamente.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Errore di sincronizzazione.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Errore di configurazione.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Stato di errore non definito.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (terminato %n sec. fa)</numerusform><numerusform>%1 (terminati %n sec. fa)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (terminato %n min. fa)</numerusform><numerusform>%1 (terminati %n min. fa)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copiato negli appunti</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Il protocollo di sincronizzazione è stato copiato negli appunti.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>File sincronizzati</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>File nuovi</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>File eliminati</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>File rinominati</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>File ignorati</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Errori</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflitti</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Caricato</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Scaricato</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Impossibile creare il contesto csync</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>La cartella locale %1 non esiste.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 dovrebbe essere una cartella.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 non è leggibile.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Il thread di CSync è stato terminato.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'. Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione Sei sicuro di voler eseguire questa operazione?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Vuoi rimuovere tutti i file?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Mantieni i file</translation> </message> @@ -752,47 +648,47 @@ Sei sicuro di voler eseguire questa operazione?</translation> <translation>È stato trovato un vecchio diario di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Stato non definito.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Attende l'inizio della sincronizzazione.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Preparazione della sincronizzazione.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>La sincronizzazione è in corso.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Il server è attualmente non disponibile.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>L'ultima sincronizzazione è stato completata correttamente.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation> %1 (La sincronizzazione è sospesa)</translation> </message> @@ -801,7 +697,7 @@ Sei sicuro di voler eseguire questa operazione?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>File</translation> </message> @@ -830,8 +726,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Proceduta guidata cartella di %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1028,186 +925,140 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Cartella/Ora</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>File</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Azione</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Dimensione</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Protocollo di sincronizzazione</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Stato della cartella non definito</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>La cartella è in attesa di essere sincronizzata.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Individuazione dei file da sincronizzare.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Il server è attualmente non disponibile.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>La sincronizzazione è in corso.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>L'ultima sincronizzazione è stato completata correttamente.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Errore di sincronizzazione.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Errore di configurazione.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>Sincronizzazione avvenuta, problemi con singoli file.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Stato di errore non definito.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>File ignorato.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>Cartella ignorata.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>Collegamento ignorato.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>Ignorato.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Copiato negli appunti</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>Il protocollo di sincronizzazione è stato copiato negli appunti.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problema: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Risultato log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Cerca:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>Tro&va</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Svuota</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Svuota la visualizzazione del log.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&alva</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Salva un file di log sul disco per il debug.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Il file '%1'<br/>non può essere aperto in scrittura.<br/><br/>Il risultato del log <b>non</b> può essere salvato!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Salva file di log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Impossibile scrivere il file di log</translation> </message> @@ -1405,17 +1256,17 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Rinomina cartella non riuscita</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperto in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Cartella locale %1 creta correttamente!</b></font></translation> </message> @@ -1440,94 +1291,94 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <translation>Connessione a %1 non riuscita:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>Errore: credenziali non valide.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Creazione della cartella locale di sincronizzazione %1 in corso... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>non riuscita.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Impossibile creare la cartella locale %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>La cartella remota non è accessibile!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>creazione cartella su ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>La cartella remota %1 è stata creata correttamente.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Connessi con successo a %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation> </message> @@ -1574,69 +1425,6 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Nuovo file disponibile</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' è stato sincronizzato con questa macchina.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nuovi file disponibili</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' e %n altro file sono stati sincronizzati con questa macchina.</numerusform><numerusform>'%1' e %n altri file sono stati sincronizzati con questa macchina.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>File rimosso</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' è stato rimosso.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>File rimossi</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' e %n altro file sono stati rimossi.</numerusform><numerusform>'%1' e %n altri file sono stati rimossi.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>File aggiornato</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' è stato aggiornato.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>File aggiornati</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' e %n altro file sono stati aggiornati.</numerusform><numerusform>'%1' e %n altri file sono stati aggiornati.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1645,8 +1433,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>Impostazioni di %1</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1918,7 +1706,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> @@ -1972,7 +1760,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Digita l'URL di ownCloud al quale vuoi collegarti (senza http o https).</translation> </message> @@ -2013,13 +1801,13 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>In&dirizzo server</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2035,7 +1823,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Etichetta di errore</translation> </message> @@ -2212,12 +2000,12 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Il vassoio di sistema non è disponibile</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 richiede un vassoio di sistema. Se stai usando XFCE, segui <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">queste istruzioni</a>. Altrimenti, installa un'applicazione vassoio di sistema come 'trayer' e riprova.</translation> </message> diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index a57471b1f..480f68e72 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -7,22 +7,17 @@ <translation>フォーム</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>同期ディレクトリ</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>同期するあなたのコンピュータ上のローカルフォルダを選択:</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>選択(&C)...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>ディレクトリのエイリアス名(&D):</translation> </message> @@ -35,32 +30,27 @@ <translation>フォーム</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>同期ターゲット</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>送り先のフォルダを選択</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>フォルダを追加</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>同期</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>フォルダ</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> @@ -83,108 +73,98 @@ <translation>対象外ファイルを編集</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>アカウント削除</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>アカウント修正</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>同期状態</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation><server> に <user> で接続中</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>同期を追加...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>一時停止</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>削除</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>リセット</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>情報...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>ストレージ利用状況</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>利用状況を取得中...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>再開</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>フォルダの削除を確認</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>フォルダのリセットを確認</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>本当にフォルダー <i>%1</i>をリセットしてクライアントのデータベースを再構築しますか？/p><p><b>注:</b>ファイルは削除されませんが、著しいデータトラフィックを引き起こし、フォルダーのサイズによりますが、数分から数時間程度かかる恐れがあります。</translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>%1 の接続を確認中...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>%1 の接続は設定されていません。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>同期実行中</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>同期操作が実行中です。<br/>終了してもよろしいですか？</translation> </message> @@ -209,150 +189,150 @@ <translation><p>%1 への接続に失敗: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>開始</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>現在</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>完全に</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>完全に終了しました。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>利用可能なストレージ %2 のうち %1 を使用しています。</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 同期開始</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation><numerusform>設定された %n フォルダの同期を開始しました。</numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>%1 をブラウザーで開く</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>制限容量を計算中...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>不明な状態</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>設定</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>詳細...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>ヘルプ</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>終了</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>なし</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>最近変更されたファイル</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>ローカルフォルダの '%1' を開く</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>管理フォルダ:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>フォルダ ’%1’ を開く</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>クオータ n/a</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%2 の %1% を使用</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>最近同期されたアイテムはありません。</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>%2 の %1 (%4 分の %3) を同期中</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>同期状態</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>フォルダ %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>同期フォルダが設定されていません。</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>フォーム</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>同期状況詳細</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>テキストラベル</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>ファイル</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>ファイル数</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>コピー</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>同期プロトコル</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>未定義のフォルダ状態</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>フォルダの同期開始を待機しています。</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>csync-context を作成出来ません</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>同期するファイルを確定しています。</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>ローカルフォルダ %1 は存在しません。</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>サーバは現在利用できません。</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 はディレクトリのはずですが、そうではないようです。</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>同期実行中です。</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 は読み込み可能ではありません。</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>最後の同期は成功しました。</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>同期エラー。</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>設定エラー。</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>未定義のエラー状態です。</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (%n 秒前に最後に完了)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (%n 分前に最後に完了)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>クリップボードにコピーしました</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>同期プロトコルをクリップボードにコピーしました</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>同期されたファイル</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>新しいファイル</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>削除されたファイル</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>名前の変更されたファイル</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>無視されたファイル</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>エラー</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>衝突</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>アップロード済み</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>ダウンロード済み</translation> - </message> -</context> -<context> - <name>Mirall::Folder</name> - <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>csync-context を作成出来ません</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>ローカルフォルダ %1 は存在しません。</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 はディレクトリのはずですが、そうではないようです。</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 は読み込み可能ではありません。</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSyncのスレッドが終了しました。</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>この同期により、ローカルの同期フォルダ '%1'にある全ファイルが削除されます。 あなた、またはあなたの管理者がサーバー上のあなたのアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Are you sure you want to perform this operation?</source> 本当にこの操作を実行しますか？</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>すべてのファイルを削除しますか？</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>すべてのファイルを削除</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>ファイルを残す</translation> </message> @@ -752,47 +648,47 @@ Are you sure you want to perform this operation?</source> <translation>古い同期ジャーナル '%1' が見つかりましたが、削除出来ませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>未定義の状態。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>同期開始を待機中</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>同期の準備中。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>同期を実行中です。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>サーバは現在利用できません。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>最後の同期は成功しました。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>設定エラー。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (同期を一時停止)</translation> </message> @@ -801,7 +697,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>ファイル</translation> </message> @@ -832,8 +728,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 フォルダウィザード</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1030,186 +927,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>フォルダ/時刻</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>ファイル</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>アクション</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>サイズ</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>コピー</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>同期状況</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>未定義のフォルダの状態</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>フォルダは同期開始の待機中です。</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>同期するファイルを確定しています。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>サーバは現在利用できません。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>同期を実行中です。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>最後の同期は成功しました。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>同期エラー。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>設定エラー。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>未定義のエラー状態。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>対象外ファイル</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>対象外ディレクトリ</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>対象外ソフトリンク</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>無視されました。</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>クリップボードにコピー</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>同期状況をクリップボードにコピーしました</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>不具合: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>ログ出力</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>検索(&S):</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>検索(&F)</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>クリア</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>ログの表示をクリアする。</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>保存(&A)</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>デバッグ目的でディスクにログファイルを保存する</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>ファイル '%1'<br/>を書き込み用で開けませんでした。<br/><br/>ログ出力を<b>保存できません</b>でした！</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>ログファイルを保存</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>ログファイルに書き込めませんでした</translation> </message> @@ -1407,17 +1258,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>フォルダー名変更に失敗しました。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>このフォルダ内のフォルダまたはファイルが他のプログラムで開かれているため、このフォルダーを削除し、バックアップすることが出来ません。フォルダまたはファイルを閉じて再試行するか、このセットアップをキャンセルしてください。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>ローカルの同期フォルダ %1 は正常に作成されました！</b></font></translation> </message> @@ -1442,94 +1293,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>%1 への接続に失敗:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>エラー:資格情報が間違っています。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>ローカルの同期フォルダ %1 はすでに存在しています、同期のために設定してください。<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>ローカルの同期フォルダ %1 を作成中... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>失敗。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>ローカルフォルダ %1 を作成できませんでした</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>リモートフォルダにアクセスできませんでした！</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>エラー: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>ownCloud上にフォルダを作成中: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>リモートフォルダ %1 は正常に生成されました。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>リモートフォルダ %1 は既に存在します。同期のために接続しています。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>フォルダの作成はHTTPのエラーコード %1 で終了しました</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>資格情報が間違っていたため、リモートフォルダの作成は失敗しました！<br/>前に戻って資格情報を確認して下さい。</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">おそらく資格情報が間違っているため、リモートフォルダの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>リモートフォルダ %1 の作成がエラーで失敗しました。<tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>%1への接続に成功しました！</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>%1 への接続を確立できませんでした。もう一度確認して下さい。</translation> </message> @@ -1576,69 +1427,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>新しいファイルが利用可能です</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' はこの計算機と同期されました。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>新しいファイルが利用可能です</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' と %n 個の他のファイルはこのマシンと同期されました。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>ファイルを削除しました</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' は削除されました。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>ファイルを削除しました</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' と %n 個の他のファイルは削除されました。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>ファイルは更新されました</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' は更新されました。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>ファイルは更新されました</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' と %n 個の他のファイルは更新されました。</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1647,8 +1435,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>設定 %1</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1920,7 +1708,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>テキストラベル</translation> </message> @@ -1974,7 +1762,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>接続するownCloudのURL（httpやhttpsを含めない）を入力してください。</translation> </message> @@ -2015,13 +1803,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>サーバアドレス(&A)</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2037,7 +1825,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>エラーラベル</translation> </message> @@ -2214,12 +2002,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>システムトレイ利用不可</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1は動作しているシステムトレイで必要とします。XFCEを動作させている場合、<a href="http://docs.xfce.org/xfce/xfce4-panel/systray">これらのインストラクション</a>を追ってください。でなければ、「トレイヤー」のようなシステムトレイアプリケーションをインストールして、再度お試しください。</translation> </message> diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index 5dbddb711..8a3b0dee1 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -7,22 +7,17 @@ <translation>Formulier</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Synchronisatiemap</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Kies een lokale map op uw computer waarmee u wilt synchroniseren:</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Kies...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Map alias naam:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulier</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Synchronisatie doel</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Selecteer de doelmap</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Voeg Map Toe</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Vernieuwen</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Mappen</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Tekstlabel</translation> </message> @@ -83,108 +73,98 @@ <translation>Wijzig genegeerde bestanden</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Verwijder account</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Aanpassen account</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Synchronisatiestatus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Verbonden met <server> als <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Toevoegen Sync...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pause</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Verwijder</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Reset</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Gebruik opslagruimte</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Gebruiksinformatie wordt opgehaald ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Hervatten</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Bevestig het verwijderen van de map</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Bevestig map reset</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Wilt u de map <i>%1</i> echt resetten en de lokale database opnieuw opbouwen?</p><p><b>Let op:</b> Hoewel er geen bestanden zullen worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Controleren van %1 connectie...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Geen %1 connectie geconfigureerd.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Verbinding met %1 mislukt: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Momenteel</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Volledig</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Helemaal klaar.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>U gebruikt %1 van uw beschikbare %2 opslag.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Sync Gestart</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Quota worden berekend ...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Onbekende status</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Instellingen...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Details ...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Afsluiten</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Geen.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Recente wijzigingen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Open lokale map '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Beheerde mappen:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Open map '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Quota niet beschikbaar</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% van %2 gebruikt</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Recent geen bestanden gesynchroniseerd</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synchroniseert %1 van %2 (%3 van %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>Gesynchroniseerd</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Map %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Geen synchronisatie-mappen geconfigureerd.</translation> </message> @@ -372,12 +352,12 @@ <message> <location filename="../src/mirall/csyncthread.cpp" line="76"/> <source>CSync failed to create a lock file.</source> - <translation>CSync kon geen lock file creëren.</translation> + <translation>CSync kon geen lock file maken.</translation> </message> <message> <location filename="../src/mirall/csyncthread.cpp" line="79"/> <source>CSync failed to load the state db.</source> - <translation>CSync kon de state db niet laten.</translation> + <translation>CSync kon de state db niet laden.</translation> </message> <message> <location filename="../src/mirall/csyncthread.cpp" line="82"/> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Gedetailleerde synchronisatiehistorie</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TekstLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Bestanden</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Aantal bestanden</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopiëren</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Synchronisatieprotocol</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Ongedefinieerde map status</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>De map wacht met synchroniseren</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Onmogelijk om een csync-context te maken</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Bepalen welke bestanden gesynchroniseerd moeten worden.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Lokale map %1 bestaat niet.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Server is op dit moment niet beschikbaar.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 zou een map moeten zijn, maar is dit niet.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Bezig met synchroniseren.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 is niet leesbaar.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Laatste synchronisatie was geslaagd.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Synchronisatiefout</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Installatiefout.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Ongedefiniëerde fout.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (laatst geëindigd %n sec. geleden)</numerusform><numerusform>%1 (laatst gereed %n sec. geleden)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (laatst geëindigd %n min. geleden)</numerusform><numerusform>%1 (laatst gereed %n min. geleden)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Gekopieerd naar klembord</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>De synchronisatiegeschiedenis is naar het klembord gekopieerd.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Gesynchroniseerde bestanden</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nieuwe bestanden</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Verwijderde bestanden</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Hernoemde bestanden</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Genegeerde bestanden</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Fouten</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflicten</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Geüpload</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Gedownload</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Onmogelijk om een csync-context te maken</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Lokale map %1 bestaat niet.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 zou een map moeten zijn, maar is dit niet.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 is niet leesbaar.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>De CSync thread is beëindigd.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'. Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Dit kan komen doordat de folder ongemerkt gereconfigureerd is of doordat alle be Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Verwijder alle bestanden?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Verwijder alle bestanden</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Bewaar bestanden</translation> </message> @@ -752,47 +648,47 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Ongedefiniëerde staat</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>In afwachting van synchronisatie.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Synchronisatie wordt voorbereid</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Bezig met synchroniseren.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>De server is nu niet beschikbaar.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Laatste synchronisatie was succesvol.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisatie onderbroken)</translation> </message> @@ -801,7 +697,7 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Bestand</translation> </message> @@ -832,8 +728,9 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 mappen wizard</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1030,186 +927,140 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TekstLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Folder/Tijdstip</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Bestand</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Handeling</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Grootte</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Kopiëren</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Synchronisatiegeschiedenis</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Map is in ongedefinieerde staat</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>De map is in afwachting van synchronisatie.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Kiezen welke bestanden gesynchroniseerd worden.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Server is nu niet beschikbaar.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Bezig met synchroniseren.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Laatste synchronisatie was succesvol.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Synchroniseerfout.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Installatiefout.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>Synchronisatie geslaagd met waarschuwingen over individuele bestanden.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Ongedefiniëerde fout.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>bestand overgeslagen</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>map overgeslagen</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>soft link overgeslagen</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>overgeslagen</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Gekopieerd naar het klembord</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>De synchronisatiegeschiedenis is naar het klembord gekopieerd.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Probleem: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Log Output</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>Zoek:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> - <translation>Vind:</translation> + <translation>&Vind</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Opschonen</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Schoon het log display op.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Opslaan</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Sla het logbestand op om te debuggen.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Bestand '%1'<br/>kan niet worden geopend voor schrijven.<br/><br/>De logging output kan <b>niet</b> worden weggeschreven!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Opslaan logbestand</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Kon niet schrijven naar logbestand</translation> </message> @@ -1325,7 +1176,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <message> <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="48"/> <source>Setup local folder options</source> - <translation>Bepaald de instellingen voor de lokale map</translation> + <translation>Bepaal de instellingen voor de lokale map</translation> </message> <message> <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="106"/> @@ -1407,17 +1258,17 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Hernoemen map mislukt</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan de backup map niet verwijderen, de map of een bestand in deze map in gebruik is door een ander programma. Sluit aub de map of het bestand en klik op opnieuw proberen of annuleer de installatie.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation> </message> @@ -1442,94 +1293,94 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <translation>Niet gelukt om te verbinden met %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>Fout: Verkeerde inloggegevens</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Creër lokale sync map %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>mislukt.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Kon lokale map %1 niet aanmaken</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>De externe map kon niet worden benaderd!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>aanmaken map op ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Externe map %1 succesvol gecreërd.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Succesvol verbonden met %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation> </message> @@ -1576,69 +1427,6 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Er is een nieuw bestand beschikbaar</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' is gesynchroniseerd met deze machine.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nieuwe bestanden beschikbaar</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' en %n andere bestanden zijn gesynchroniseerd met deze machine.</numerusform><numerusform>'%1' en %n andere bestanden zijn gesynchroniseerd met deze machine.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Bestand verwijderd</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' is verwijderd.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Bestand verwijderd</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' en %n ander bestand zijn verwijderd.</numerusform><numerusform>'%1' en %n andere bestanden zijn verwijderd.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Bestand bijgewerkt</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' is bijgewerkt.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Bestanden bijgewerkt</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' en %n ander bestand zijn bijgewerkt.</numerusform><numerusform>'%1' en %n andere bestanden zijn bijgewerkt.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1647,8 +1435,8 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1 instellingen</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1671,7 +1459,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <message> <location filename="../src/mirall/sslerrordialog.cpp" line="30"/> <source>SSL Connection</source> - <translation>SSL Connectie</translation> + <translation>SSL-verbinding</translation> </message> <message> <location filename="../src/mirall/sslerrordialog.cpp" line="104"/> @@ -1920,7 +1708,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TekstLabel</translation> </message> @@ -1974,7 +1762,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Voer de url in van de ownCloud waarmee je wilt verbinden (met http of https).</translation> </message> @@ -2015,13 +1803,13 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Server&adres</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2037,7 +1825,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Fout label</translation> </message> @@ -2214,12 +2002,12 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Systeem icoon niet beschikbaar</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 heeft een werkend systeem icoon nodig. Als je XFCE draait volg <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">deze instructies</a>. Anders, installeer een systeem icoon applicatie zoals 'trayer' and probeer het opnieuw.</translation> </message> diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index cd16708c6..cc14a652e 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -7,22 +7,17 @@ <translation>Formularz</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Katalog synchronizacji</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Wybierz folder lokalny na komputerze do synchronizacji:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Wybierz...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Nazwa aliasu katalogu:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formularz</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Synchronizacja docelowa</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Wybierz folder docelowy</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Dodaj folder</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Odśwież</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Katalogi</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Etykieta tekstowa</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Usuń Konto</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Zmień Konto</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Status synchronizacji</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Połączony z <server> jako <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Dodaj synchronizację...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Wstrzymaj</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Resetuj</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Informacje...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Użycie zasobów</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Wznów</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Potwierdź usunięcie katalogu</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Potwierdź reset folderu </translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Sprawdzam %1 połączenie...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Połączenie %1 nie skonfigurowane.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Błąd połączenia do %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Całkowicie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Całkowicie zakończony.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Używasz %1 z dostępnych %2 zasobów.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Synchronizacja rozpoczęta</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Otwórz %1 w przeglądarce</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Obliczam quote...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Nieznany status</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Ustawienia...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Szczegóły...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Wyjdź</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Brak.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Otwórz lokalny folder '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Zarządzane foldery:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Otwórz katalog '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Quota n/a</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% z %2 użytych</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>W synchronizacji</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Nie skonfigurowano synchronizowanych folderów.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Szczegółowy protokół synchronizacji</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Etykieta</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Pliki</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Ilość plików</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopiuj</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protokół synchronizacji</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Niezdefiniowany stan folderu</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Katalog oczekuje na synchronizację.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Określanie, które pliki synchronizować.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Folder lokalny %1 nie istnieje.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Serwer jest obecnie niedostępny.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 powinien być katalogiem, ale nie jest.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Synchronizacja w toku.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 jest nie do odczytu.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Błąd synchronizacji.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Błąd konfiguracji.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Niezdefiniowany błąd stanu.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Skopiuj do schowka</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Protokół synchronizacji został skopiowany do schowka.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Pliki zsynchronizowane</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nowe pliki</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Usunięte pliki</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Pliki o zmienionej nazwie</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Pliki ignorowane</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Błędy</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Konflikty</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Wysłane</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Pobrane</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Folder lokalny %1 nie istnieje.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 powinien być katalogiem, ale nie jest.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 jest nie do odczytu.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Wątek CSync zakończony.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Usunąć wszystkie pliki?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Pozostaw pliki</translation> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Niezdefiniowany stan</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Czekają na uruchomienie synchronizacji.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Synchronizacja w toku</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Serwer jest obecnie niedostępny.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation> %1 (Synchronizacja jest zatrzymana)</translation> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Plik</translation> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Kreator folderów</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Etykieta</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Katalog/Czas</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Plik</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Rozmiar</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Kopiuj</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Protokół synchronizacji</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Niezdefiniowany stan folderu</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Folder czeka na uruchamianie synchronizacji</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Określanie, które pliki synchronizować.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Serwer jest obecnie niedostępny.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Synchronizacja w toku</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Błąd synchronizacji</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Błąd ustawień.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Niezdefiniowany błąd stanu.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>Plik zignorowany.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>Protokół synchronizacji został skopiowany do schowka.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problem: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Treść dziennika</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Szukaj: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Znajdź</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Wyczyść</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Wyczyść wyświetlane dzienniki.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Z&apisz</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Zapisz plik dziennika do pliku na dysku w celu debugowania.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Plik '%1'<br>nie może zostać otwarty do zapisu.<br/><br/>Dane wyjściowe dziennika <b>nie</b> mogą być zapisane!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Zapisz plik dziennika</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Nie można zapisać w pliku dziennika</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Zmiana nazwy folderu nie powiodła się</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Nie udało się nawiązać połączenia z %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Tworzenie lokalnego folderu synchronizowanego %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>OK</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>Błąd.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Nie udało się utworzyć lokalnego folderu %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Nie udało się uzyskać dostępu do zdalnego folderu!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>tworzę folder na ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Zdalny folder %1 został utworzony pomyślnie.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Udane połączenie z %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Nowy plik dostępny</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>Zsynchronizowano '%1' z tą maszyną.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nowe pliki dostępne</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' i %n inne pliki zostały zsynchronizowane z tą maszyną.</numerusform><numerusform>'%1' i %n inne pliki zostały zsynchronizowane z tą maszyną.</numerusform><numerusform>„%1” oraz %n inny(ch) plik(ów) zostało zsynchronizowanych z tą maszyną.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Usunięto plik</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>Usunięto „%1”.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Pliki usunięto</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>%1' i %n inne pliki zostały usunięte z tej maszyny.</numerusform><numerusform>%1' i %n inne pliki zostały usunięte z tej maszyny.</numerusform><numerusform>Usunięto „%1” oraz %n inny(ch) plik(ów).</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Plik zaktualizowano</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>„%1” został uaktualniony.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Pliki zaktualizowano</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>%1' i %n inne pliki zostały uaktualnione na tej maszynie.</numerusform><numerusform>%1' i %n inne pliki zostały uaktualnione na tej maszynie.</numerusform><numerusform>Uaktualniono „%1” oraz %n inny(ch) plik(ów).</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,8 +1428,8 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1 Ustawienia</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Etykieta tekstowa</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Wprowadź adres ownCloud, z którym chcesz się połączyć (bez http lub https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Adres &serwera</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Etykieta błędu</translation> </message> @@ -2208,12 +1996,12 @@ Kliknij</translation> <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 5c135b8a3..9d3f5093f 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -7,22 +7,17 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Directoria de sincronização</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Escolha uma posta do seu computador para sincronizar:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Escolha...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>Nome do &directorio:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Alvo da sincronização</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Acrescentar pasta</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Adicionar sincronização...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pausa</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Apagar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Resumir</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirme a remoção da pasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>A testar a ligação a %1 ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>%1 sem ligação configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>A sincronização está a decorrer</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Falha a ligar a %1 : <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 A sincronização inicou.</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Sair</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Pastas Geridas:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Nenhuma pasta de sincronização configurada.</translation> </message> @@ -528,211 +508,127 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Ficheiros</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Contagem ficheiros</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocolo de sincronização</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>A pasta local %1 não existe.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Estado da pasta indefinido</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 devia de ser um directório mas não é</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>A pasta está a espera que inicie a sincronização</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>Não é possível ler %1</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>O servidor está indisponível</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>A sincronizar</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>A ultima sincronização foi efectuada com sucesso.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Erro na sincronização</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Erro na instalação</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Erro não definido</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copiado para a área de transferência</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>O protocolo de sincronização foi copiado para a área de transferência</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Ficheiros sincronizados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Ficheiros Novos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Ficheiros Apagados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Ficheiros Renomeados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Ficheiros Ignorados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Erros</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflitos</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Carregado</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Descarregado</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>A pasta local %1 não existe.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 devia de ser um directório mas não é</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>Não é possível ler %1</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>A operação CSync terminou.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -750,47 +646,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>A aguardar o inicio da sincronização.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>A sincronização está a correr.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>A última sincronização foi efectuada com sucesso.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Erro na instalação.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -799,7 +695,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -828,8 +724,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Assistente de pasta %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1024,186 +921,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Estado da pasta nao definido</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>A pasta está a aguardar a sincronização.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>A sincronização está a correr.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>A última sincronização foi efectuada com sucesso.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Erro na sincronização.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Erro na instalação.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Estado do erro não definido.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Escrita do Registo - log output</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Procurar:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Encontrar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Limpar.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Limpar o registo.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&Guardar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Guarde o ficheiro de registo no disco para debug.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>O ficheiro '%1'<br/>não pode ser aberto para escrita.<br/><br/>O ficheiro de registo <b>not</b> pode ser guardado!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Guardar ficheiro de log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Não foi possível escrever no ficheiro de log</translation> </message> @@ -1401,17 +1252,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation> </message> @@ -1436,94 +1287,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>A pasta de sincronização locl %1 já existe, a configurar para sincronizar.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>A criar a pasta de sincronização local %1 ... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>Falhou.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Criação da pasta remota %1 com sucesso!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou num erro HTTP com o código %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>A criação da pasta remota %1 falhou com o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation> </message> @@ -1570,69 +1421,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Novo ficheiro disponível</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' foi sincronizado com esta máquina</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Novos ficheiros disponíveis</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' e %n outro ficheiro foi sincronizado com esta máquina</numerusform><numerusform>'%1' e %n outros ficheiros foram sincronizados com esta máquina</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Ficheiro eliminado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' foi removido com sucesso</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Ficheiros removidos</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' e %n outro ficheiro foi removido</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Ficheiro actualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' foi actualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Ficheiros actualizados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' e %n outro ficheiro foi actualizado</numerusform><numerusform>'%1' e %n outro ficheiros foram actualizados</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1641,7 +1429,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1914,7 +1702,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1968,7 +1756,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Introduza o URL do ownCloud a que se deseja ligar. (Sem http ou https).</translation> </message> @@ -2009,13 +1797,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation type="unfinished"/> </message> @@ -2031,7 +1819,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2208,12 +1996,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index f1e547386..af9360dbf 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -7,22 +7,17 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Diretório de Sincronização</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Selecione um diretório no seu computador para ser sincronizado:</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Escolha...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>Apelido do &Diretório:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulário</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Alvo de Sincronização</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Selecione uma pasta destino</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Adicionar Pasta</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Atualizar</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Pastas</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation>Editar Arquivos Ignorados</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Remover Conta</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Modificar Conta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Sinconizar Status</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Conectado com <server> como <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Adicionar Sincronização...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pause</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Resetar</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Informação...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Uso de Armazenamento</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Recuperando informações sobre o uso...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Resumir</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Confirma remoção da pasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Confirme Reiniciar Pasta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir sua base de clientes?</p><p><b>Nota:</b> Enquanto que nenhum arquivo será removido, isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Checando conexão a %1...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Sem %1 conexão configurada.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Sincronização acontecendo</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Falha ao conectar à %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Iniciar</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Atualmente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Completamente</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Completamente finalizado.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Você está usando %1 de seus %2 disponível para armazenamento.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Sincronização Iniciada</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Calculando cota...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Status desconhecido</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Sair</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Nenhum.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Alterações Recentes</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Abrir pasta local '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Pastas Gerenciadas:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Cota n/a</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% de %2 usada</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Não há itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Sincronizando %1 de %2 (%3 de %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>Em Sincronização</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Pastas de sincronização não configuradas.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Protocolo de Sincronização Detalhado</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Arquivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Contagem de arquivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protocolo de sincronização</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Estado da pasta indefinido</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>A pasta aguarda para iniciar a sincronização.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Não é possível criar csync-contexto</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Determinar quais arquivos para sincronizar.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>A pasta local %1 não existe.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Servidor indisponível no momento.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 deveria ser uma pasta, mas não é.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Sincronização em andamento.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 não pode ser lido.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>A última sincronização feita com sucesso.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Erro na sincronização.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Erro de configuração.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Erro de estado indefinido.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (último terminou %n seg. atrás)</numerusform><numerusform>%1 (último terminou %n seg. atrás)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (último terminou %n min. atrás)</numerusform><numerusform>%1 (último terminou %n min. atrás)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Copiados para a área de transferência</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>O protocolo de sincronização foi copiado para a área de transferência.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Arquivos Sincronizados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Novos Arquivos</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Arquivos Apagados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Arquivos Renomeados</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Arquivos Ignorados</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Erros</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Conflitos</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Enviado</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Baixado</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Não é possível criar csync-contexto</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>A pasta local %1 não existe.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 deveria ser uma pasta, mas não é.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 não pode ser lido.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>A thread CSync foi terminada.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'. Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu Você tem certeza que quer executar esta operação?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Remover Todos os Arquivos?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Remover Rodos os Arquivos</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Manter arquivos</translation> </message> @@ -752,47 +648,47 @@ Você tem certeza que quer executar esta operação?</translation> <translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Aguardando o inicio da sincronização.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Preparando para sincronização.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>A sincronização está ocorrendo.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Servidor indisponível no momento.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>A última sincronização foi feita com sucesso.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Erro de configuração.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (Pausa na Sincronização) </translation> </message> @@ -801,7 +697,7 @@ Você tem certeza que quer executar esta operação?</translation> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Arquivo</translation> </message> @@ -832,8 +728,9 @@ documentação por possíveis correções.</translation> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Assistente de pastas</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1029,186 +926,140 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Pasta/Tempo</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Arquivo</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Ação</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Protocolo de Sincronização</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Estado da pasta indefinido</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>A pasta aguarda para iniciar a sincronização.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Determinar quais arquivos para sincronizar.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>O servidor não está disponível no momento.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>A sincronização está ocorrendo.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>A última sincronização foi feita com sucesso.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Erro na sincronização.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Erro de configuração.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>A sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Erro de estado indefinido.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>Arquivo ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>Diretório ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>Soft Link ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>Ignorado.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Copiado para área de transferência</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>O protocolo de sincronização foi copiado para a área de transferência.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problema: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Saída de Log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>Bu&scar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>Localizar (&F)</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Limpar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Limpar exibição de log.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&alvar</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Salvar arquivo de log para um arquivo no disco para depuração.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Arquivo '%1'<br/>não pode ser aberto para escrita.<br/><br/>A saída de log <b>não</b> pode ser salva!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Salvar arquivo de log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Incapaz de gravar arquivo de log</translation> </message> @@ -1406,17 +1257,17 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Falha no nome da pasta</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Não é possível remover e fazer o backup da pasta porque a pasta ou um arquivo que está na pasta, está aberto em outro program. Por favor feche a pasta ou o arquivo e clique novamente ou cancelar a configuração.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation> </message> @@ -1441,94 +1292,94 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <translation>Falha na conexão para %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>Erro: Credenciais erradas.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Pasta local de sincronização %1 já existe, configurando para sincronização. <br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Criando pasta local de sincronização %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>falhou.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Não foi possível criar pasta local %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>A pasta remota não pôde ser acessada!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>criar pasta no ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Pasta remota %1 criada com sucesso.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Pasta remota %1 já existe. Conectando para sincronizar.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou em um erro HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas! <br/>Por favor volte e verifique suas credenciais.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Prováveis causas da falha na criação da pasta remota são credenciais erradas</font><br/>Volte e verifique suas credenciais, por favor.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Criação da pasta remota %1 com erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Conectado com sucesso a %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Conexão à %1 não foi estabelecida. Por favor verifique novamente.</translation> </message> @@ -1575,69 +1426,6 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Novo arquivo disponível</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' foi sincronizado com esta máquina</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Novos arquivos disponíveis</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' e %n outro(s) arquivo(s) não foram sincronizados para esta máquina.</numerusform><numerusform>'%1' e %n outro(s) arquivo(s) não foram sincronizados para esta máquina.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Arquivo removido</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' foi removido.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Arquivos removidos</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' e %n outro(s) arquivo(s) foram removidos.</numerusform><numerusform>'%1' e %n outro(s) arquivo(s) foram removidos.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Arquivo atualizado</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' foi atualizado.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Arquivos atualizados</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' e %n outro(s) arquivo(s) foram atualizados.</numerusform><numerusform>'%1' e %n outro(s) arquivo(s) foram atualizados.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1646,8 +1434,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1 Configurações</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1919,7 +1707,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1973,7 +1761,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Digite a URL do ownCloud que você deseja se conectar (sem http ou https)</translation> </message> @@ -2014,13 +1802,13 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Endereço do Servidor</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2036,7 +1824,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Rótulo de Erro</translation> </message> @@ -2213,12 +2001,12 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Bandeja do Sistema não disponível</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 requer em uma bandeja do sistema de trabalho. Se você estiver executando o XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray"> estas instruções </a>. Caso contrário, instale uma aplicação da bandeja do sistema, como 'trayer' e tente novamente.</translation> </message> diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 77baa0fc8..c3aecd696 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -7,22 +7,17 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Синхронизация каталогов</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Выберите локальную папку на вашем компьютере для синхронизации:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Выбрать...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Псевдоним каталога :</translation> </message> @@ -35,32 +30,27 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Назначение синхронизации</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Выберите папку назначения</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Добавить папку</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation>Изменить проигнорированные файлы</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Удалить учётную запись</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Изменить учётную запись</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Синхронизация статуса</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Подключен к <server> как <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Добавить...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Пауза</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Сброс</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Инфо...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Использование хранилища</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Продолжить</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Подтвердите удаление папки</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Подтвердить сброс папки</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Проверка %1 соединения...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>Не удалось подключиться к %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Синхронизация начата</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Выход</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Управляемые папки:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Папка %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Нет папок для синхронизации.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Расчет файла</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Протокол синхронизации</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Неопределнённый статус папки</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Папка ожидает начала синхронизации.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Определение файлов для синхронизации.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Локальный каталог %1 не существует.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Сервер не доступен.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 должен быть каталогом, но не является таковым.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Идет синхронизация.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 не читается.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Последняя синхронизация была удачна.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Ошибка синхронизации.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Ошибка установки.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Неизвестный статус ошибки.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (завершено %n сек. назад)</numerusform><numerusform>%1 (завершено %n сек. назад)</numerusform><numerusform>%1 (завершено %n сек. назад)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (завершено %n мин. назад)</numerusform><numerusform>%1 (завершено %n мин. назад)</numerusform><numerusform>%1 (завершено %n мин. назад)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Скопировано в буфер обмена</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Протокол синхронизации был скопирован в буфер обмена.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Синхронизированные файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Новые файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Удаленные файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Переименованные файлы</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Проигнорированные файлы</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Ошибки</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Конфликты</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Загружено</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Скачано</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Локальный каталог %1 не существует.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 должен быть каталогом, но не является таковым.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 не читается.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync поток закрыт.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Ожидает, чтобы начать синхронизацию.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Мастер папка</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Размер</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Неопределенное состоянии папки</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Папка ожидает начала синхронизации.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Идет синхронизация.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Последняя синхронизация прошла успешно.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Ошибка синхронизации.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Ошибка установки.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Неопределенное состояние ошибки.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Поиск:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Найти</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Очистить журнал.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>Сохранить</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Сохранить файл журнала на диск для отладки.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Файл '%1'<br/>не может быть открыт на запись.<br/><br/>Журнал <b>не может</b> быть сохранён!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Сохранить файл журнала</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Файл журнала не может быть записан</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Ошибка переименования папки</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Невозможно стереть папку и создать её резервную копию так как папка или файл в ней открыты в другой программе. Пожалуйста закройте папку или файл и повторите попытку, либо прервите мастер настройки.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальная папка для синхронизации %1 успешно создана!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Не удалось подключиться к %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Локальная синхронизация папки %1 уже существует, ее настройки для синхронизации.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Создание локальной папки синхронизации %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ок</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>не удалось.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Не удалось создать локальную папку синхронизации %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Не удалось получить доступ к удаленной папке!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>создание папки на ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Удалённая папка %1 успешно создана.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Удалённая папка %1 уже существует. Подключение к ней для синхронизации.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Создание папки завершилось с HTTP-ошибкой %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Не удалось создать удаленную папку — представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте параметры доступа.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Удаленное создание папки не удалось, вероятно, потому, что предоставленные учетные данные неверны.</font><br/>Пожалуйста, вернитесь назад и проверьте данные.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Удаленная папка %1 не создана из-за ошибки <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Установлено соединение синхронизации с %1 к удалённой директории %2.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Соединение с %1 установлено успешно!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Подключение к %1 не воможно. Пожалуйста, проверьте еще раз.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Доступен новый файл</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' было синхронизировано с этой машиной.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Доступны новые файлы</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' и ещё %n другой файл(ов) были синхронизированны с этой машиной.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были синхронизированны с этой машиной.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были синхронизированны с этой машиной.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Файл удалён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' был удалён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Файлы удалены</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' и ещё %n другой файл(ов) были удалены.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были удалены.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были удалены.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Файл обновлён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' был обновлён</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Файлы обновлены</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' и ещё %n другой файл(ов) были обновленны.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были обновленны.</numerusform><numerusform>'%1' и ещё %n других файл(ов) были обновленны.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Введите адрес ownCloud, к которому вы хотите подключиться (без http или https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>&Адрес сервера</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Название ошибки</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>System Tray не доступна</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index d6b1db60e..21291bb1a 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -7,22 +7,17 @@ <translation>Formulár</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Synchronizácia priečinka</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Vyberte lokálny priečinok pre synchronizáciu:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Zvoliť</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Alias názvu priečinka</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulár</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Synchronizačný cieľ</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Vyberte cieľový priečinok</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Pridať priečinok</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Obnoviť</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Pridať synchronizáciu...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Pauza</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Odobrať</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Obnovenie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Potvrdiť odstránenie priečinka</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Kontrolujem %1 spojenie...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Žiadne nakonfigurované %1 spojenie</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Prebiehajúca synchronizácia.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Nemožno pripojiť na %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Synchronizácia začala</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Ukončiť</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Spravované priečinky:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Nenastavené žiadne synchronizačné priečinky.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Formulár</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Súbory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Počet súborov</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopírovať</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protokol synchronizácie</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Lokálny priečinok %1 neexistuje.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Nedefinovaný stav priečinka</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 by mal byť priečinok, avšak nie je.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Priečinok čaká na zosynchronizovanie.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 nie je čitateľný.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Server je teraz nedostupný.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Synchronizácia je spustená.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Posledná synchronizácia prebehla vporiadku.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Chyba synchronizácie.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Chybné nastavenia.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Nedefinovaná chyba.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Nakopírované do schránky</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Protokol synchronizácie bol nakopírovaný do schránky.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Zosynchronizované súbory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nové súbory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Zmazané súbory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Premenované súbory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Ignorované súbory</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Chyby</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Kolízie</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Odoslané</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Stiahnuté</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Lokálny priečinok %1 neexistuje.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 by mal byť priečinok, avšak nie je.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 nie je čitateľný.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>Vlákno "CSync" ukončené.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Čakanie na štart synchronizácie.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Synchronizácia prebieha.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Posledná synchronizácia úspešne skončila.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Chyba pri inštalácii.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Asistent priečinka</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Veľkosť</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Nedefinovaný stav priečinka</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Priečinok čaká na zosynchronizovanie.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Synchronizácia prebieha.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Posledná synchronizácia úspešne skončila.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Synchronizačná chyba.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Chyba pri inštalácii.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Nedefinovaný chybový stav.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Systémový záznam (log)</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Hľadať:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Nájsť</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Vyčistiť</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Vyčistiť zobrazenie záznamu (logu).</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&Uložiť</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Uložiť log súbor do súboru na disk pre proces debugovania.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Súbor '%1'<br/>nesmie byť otvorený pre proces úprav.</br/><br/>Systémový záznam (log) <b>nemôže</b> byť uložený!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Uložiť súbor so záznamami (log)</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Nemožno zapísať do záznamového súboru (logu)</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Nepodarilo sa pripojiť k %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokálny synchronizačný priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Vytváranie lokálneho synch. priečinka %1 ...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>v poriadku</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>neúspešné.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Nemožno vytvoriť miestny priečinok %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Vzdialený priečinok nie je dostupný!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>vytváram priečinok v ownCloude: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Vzdialený priečinok %1 úspešne vytvorený.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytváranie priečinka skončilo z HTTP chybovým kódom %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Synchronizačné spojenie z %1 do vzidaleného priečinka %2 bolo práve nastavené.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Úspešne pripojené s %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte znova.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Nový súbor je dostupný</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' bol zosynchronzovaný s týmto počítačom.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nové súbory sú dostupné</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' and %n iné súbory boli synchronizované v tomto počítači.</numerusform><numerusform>'%1' and %n iné súbory boli synchronizované v tomto počítači.</numerusform><numerusform>'%1' and %n iné súbory boli synchronizované v tomto počítači.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Súbor odstránený</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' bol odstránený.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Súbory vymazané</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' a %n iný súbor bol odstránený.</numerusform><numerusform>'%1' and %n iné súbory boli odstránené.</numerusform><numerusform>'%1' and %n iné súbory boli odstránené.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Súbor aktualizovaný</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' bol aktualizovaný.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Súbory aktualizované</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' a %n iný súbor bol aktualizovaný.</numerusform><numerusform>'%1' and %n iné súbory boli aktualizované.</numerusform><numerusform>'%1' and %n iné súbory boli aktualizované.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Vložte URL inštancie ownCloud ku ktorej sa chcete pripojiť (bez http alebo https)</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 79fecd3e9..78771a17c 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -7,22 +7,17 @@ <translation>Obrazec</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Usklajevanje mape</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Izberite krajevno mapo na računalniku za usklajevanje:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Izberi ...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Vzdevek mape:</translation> </message> @@ -35,32 +30,27 @@ <translation>Obrazec</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Ciljno mesto usklajevanja</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Izberite ciljni direktorij</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Dodaj mapo</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Osveži</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Oznaka</translation> </message> @@ -83,108 +73,98 @@ <translation>Uredi prezrte datoteke</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Odstrani račun</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Spremeni račun</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Dodaj usklajevanje...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Premor</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Odstrani</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Ponastavi</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Poraba prostora</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Pridobivanje podatkov o porabi...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Nadaljuj</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Potrdi odstranitev mape</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Preverjam %1 povezavo ...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Ni nastavljenih %1 povezav.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Usklajevanje se izvaja</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Izvaja se usklajevanje.<br/>Ali ga želite prekiniti?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>Ne morem se povezati z %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Začni</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Trenutno</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Skupno</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>Usklajevanje %1 je začeto</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Preračunavanje kvote...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Neznan status</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Nastavitve...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Pomoč</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Končaj</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Upravljane mape:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Mapa %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Ni nastavljenih map za usklajevanje.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Obrazec</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Besedilna oznaka</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Datoteke</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Števec datotek</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopiraj</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Protokol usklajevanja</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Nedoločljivo stanje mape</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Mapa je pripravljena za začetek usklajevanja.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Določanje datotek, ki jih boste sinhronizirali</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Krajevna mapa %1 ne obstaja.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Strežnik trenutno ni na voljo.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 bi morala biti mapa, vendar ni.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Usklajevanje se izvaja.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 ni mogoče brati.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Zadnje usklajevanje je bilo uspešno končano.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Napaka med usklajevanjem.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Napaka nastavitve.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Nedoločljivo stanje napake.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Kopirano v odložišče</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Protokol usklajevanja je kopiran v odložišče.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Usklajene datoteke</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nove datoteke</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Izbrisane datoteke</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Preimenovane datoteke</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Prezrte datoteke</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Napake</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Spori</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Poslano</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Prejeto</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Krajevna mapa %1 ne obstaja.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 bi morala biti mapa, vendar ni.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 ni mogoče brati.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Napaka</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync nit je zaključena.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Odstrani vse dokumente</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Ohrani dokumente</translation> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>Obstaja strarejši dnevnik sinhronizacije '%1', vendar ne more biti odstranjen. Preverite, da ni v uporabi.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Nedoločeno stanje.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Čakam na začetek usklajevanja.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Usklajevanje se izvaja.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Strežnik trenutno ni na voljo.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Zadnje usklajevanje je bilo uspešno.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Napaka nastavitev.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Datoteka</translation> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 čarovnik mape</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Besedilna oznaka</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Nedoločeno stanje mape</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Čakanje na začetek usklajevanja mape.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Usklajevanje se izvaja.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Zadnje usklajevanje je bilo uspešno.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Napaka pri usklajevanju.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Napaka nastavitev.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Nedoločeno stanje napake.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Beleži odvod</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Poišči: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Najdi</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Počisti</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Počisti izpis dnevnika.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&hrani</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Shrani beleženje v dnevniško datoteko na disk za nadaljnje razhroščevanje.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Napaka</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Datoteke '%1'<br/>ni mogoče odpreti za pisanje.<br/><br/>Dnevniškega zapisa <b>ni mogoče</b> shraniti!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Shrani dnevniško datoteko</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>V dnevniško datoteko ni mogoče pisati.</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Preimenovanje mape je spodletelo</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Mape ni mogoče odstraniti in ustvariti njeno varnostno kopijo, saj je mapa oziroma dokument v njej odprt v drugem programu. Zaprite mapo/dokument ali prekinite nastavitev.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>Povezava je spodletela %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Ustvarjanje mape za krajevno usklajevanje %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>je v redu</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>je spodletelo.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Lokalne mape ni bilo mogoče ustvariti %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Oddaljene mape ni bilo mogoče doseči.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Napaka: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>ustvarjanje mape na ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Ustvarjanje oddaljene mape je spodletelo, saj ste navedli napačne dostopovne podatke. <br/>Poskusite s prijavo ponovno.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.</font><br/>Vrnite se na predhodno stran in jih preverite.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Povezava z %1 je uspešno vzpostavljena!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Na voljo je nova datoteka</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' je usklajena s tem računalnikom.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Na voljo so nove datoteke</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' in %n druga datoteka je usklajena s tem računalnikom.</numerusform><numerusform>'%1' in %n drugi datoteki sta usklajeni s tem računalnikom.</numerusform><numerusform>'%1' in %n druge datoteke so usklajene s tem računalnikom.</numerusform><numerusform>'%1' in %n drugih datotek je usklajenih s tem računalnikom.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Datoteka je odstranjena</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' je odstranjena.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Odstranjene datoteke</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' in %n druga datoteka je odstranjena.</numerusform><numerusform>'%1' in %n drugi datoteki sta odstranjeni.</numerusform><numerusform>'%1' in %n druge datoteke so odstranjene.</numerusform><numerusform>'%1' in %n drugih datotek je odstranjenih.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Posodobljena datoteka</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' je posodobljena.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Posodobljene datoteke</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' in %n druga datoteka je posodobljena.</numerusform><numerusform>'%1' in %n drugi datoteki sta posodobljeni.</numerusform><numerusform>'%1' in %n druge datoteke so posodobljene.</numerusform><numerusform>'%1' in %n drugih datotek je posodobljenih.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Besedilna oznaka</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Vnesite naslov URL oblaka ownCloud, s katerim želite vzpostaviti povezavo (brez http ali https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Strežnik &naslov</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Oznaka napake</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 1a676d3e3..7a2574515 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -7,22 +7,17 @@ <translation>Formulär</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Synkroniseringsmapp</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Välj en lokal mapp på din dator att synkronisera:</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Välj...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Annat namn för mapp:</translation> </message> @@ -35,32 +30,27 @@ <translation>Formulär</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Synkroniseringsmål</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>Välj en destinationsmapp</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Lägg till mapp</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Uppdatera</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation>Mappar</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Textetikett</translation> </message> @@ -83,108 +73,98 @@ <translation>Ändra ignorerade filer</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation>Radera Konto</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation>Ändra Konto</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation>Synkroniseringsstatus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation>Ansluten till <server> som <user></translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Lägg till synk...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Paus</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Radera</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> - <translation>Återställ</translation> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Info...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation>Lagringsutrymme</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation>Hämtar information om användning...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Återuppta</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Bekräfta radering av mapp</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation>Bekräfta återställning av mapp</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> - <translation><p>Vill du verkligen återställa mappen <i>%1</i> och och bygga om databasen?</p><p><b>Notera:</b> Även om inga filer raderas kan detta orsaka en hel del datatrafik och ta från ett antal minuter upp till flera timmar, beroende av mappens storlek.</p></translation> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Kontrollerar %1 anslutning...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Ingen %1 anslutning konfigurerad.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Synkronisering pågår</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <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> @@ -209,150 +189,150 @@ <translation><p>Misslyckades ansluta till %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation>Start</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation>Nuvarande</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation>Fullständigt</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <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="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation>Helt klar.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <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="646"/> - <source>You are using %1 of your available %2 storage.</source> - <translation>Du använder %1 av din tillgängliga %2 lagring.</translation> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> + <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 Synk startad</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation><numerusform>Synkronisering startad för %n konfigurerade synk-katalog(er).</numerusform><numerusform>Synkronisering startad för %n konfigurerade synk-katalog(er).</numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation>Öppna %1 i webbläsaren</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation>Beräknar kvot...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation>Okänd status</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation>Inställningar...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation>Detaljer...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Hjälp</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Avsluta</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> + <location filename="../src/mirall/application.cpp" line="362"/> <source>None.</source> <translation>Ingen.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> + <location filename="../src/mirall/application.cpp" line="366"/> <source>Recent Changes</source> <translation>Senaste ändringar</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> - <translation>Öppna lokal mapp '%1'</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Hanterade mappar:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation>Öppna mapp '%1'</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation>Kvot n/a</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation>%1% av %2 använd</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation>Inga filer har synkroniseras nyligen</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation>Synkar %1 av %2 (%3 av %4) </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation>Synkad</translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>Mapp %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Ingen synkroniseringsmapp är konfigurerad.</translation> </message> @@ -527,195 +507,111 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> - <translation>Detaljerat synkroniseringsprotokoll</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Textetikett</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Filer</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Antal filer</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Kopiera</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Synkprotokoll</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Odefinierad mappstatus</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Mappen väntar på att starta synk.</translation> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> + <translation>Kan inte skapa csync-context</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>Avgör vilka filer som ska synkroniseras.</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Den lokala mappen %1 finns inte.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Servern är för närvarande inte tillgänglig.</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 ska vara en mapp, men är inte det.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Synk körs.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 är inte läsbar.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Senaste synk lyckades.</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Synkfel.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Installationsfel.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Odefinierat felläge.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (slutfördes %n sek. sedan)</numerusform><numerusform>%1 (slutfördes %n sek. sedan)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (slutfördes %n min. sedan)</numerusform><numerusform>%1 (slutfördes %n min. sedan)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Kopierat till urklipp</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Synkprotokollet har kopierats till urklipp.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Synkade filer</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Nya filer</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Raderade filer</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Omdöpta filer</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Ignorerade filer</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Fel</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Konflikter</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Uppladdad</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Nedladdats</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> - <translation>Kan inte skapa csync-context</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Den lokala mappen %1 finns inte.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 ska vara en mapp, men är inte det.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 är inte läsbar.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync-tråden avslutades.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation>Denna synk skulle radera alla filer i den lokala mappen '%1'. Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> @@ -724,17 +620,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file Är du säker på att du vill fortsätta?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation>Ta bort alla filer?</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation>Ta bort alla filer</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation>Behåll filer</translation> </message> @@ -752,47 +648,47 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Okänt tillstånd.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Väntar på att starta synkronisering.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation>Förbereder synkronisering</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Synkronisering pågår.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation>Servern är för tillfället inte tillgänglig.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Senaste synkronisering lyckades.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Inställningsfel.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synk är stoppad)</translation> </message> @@ -801,7 +697,7 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation>Fil</translation> </message> @@ -831,8 +727,9 @@ Applikationen kommer inte att fungera tillförlitligt. Kontrollera dokumentation <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 Mappguide</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1029,186 +926,140 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Textetikett</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation>Mapp/Tid</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation>Fil</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation>Ågärd</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Storlek</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation>Kopiera</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation>Synkprotokoll</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Okänd mappstatus</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Mappen väntar på att synkronisering ska starta.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation>Kontrollerar vilka filer som ska synkroniseras.</translation> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> - <translation>Servern är för närvarande inte tillgänglig.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Synkronisering pågår.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Senaste synkronisering lyckades.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Synkroniseringsfel.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Inställningsfel.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation>Synkningen lyckades, men med varningar för vissa filer!</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Odefinierat fel.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation>%1</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation>Filen ignorerad.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation>Mappen ignorerad.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation>Länken ignorerad.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation>Ignorerade.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation>Kopierat till urklipp</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation>Synkprotokollet har kopierats till urklipp.</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation>Problem: %1</translation> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Loggdata</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Sök: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Hitta</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Rensa</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Rensa loggfönstret.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>S&para</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Spara loggfilen till en fil på disk för felsökning.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Filen '%1'<br/>kan inte öppnas för skrivning.<br/><br/>Loggtexten kan <b>inte</b> sparas!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Spara loggfil</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Kunde inte skriva till loggfilen</translation> </message> @@ -1406,17 +1257,17 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>Omdöpning av mapp misslyckades</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan inte ta bort och göra en säkerhetkopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation> </message> @@ -1441,94 +1292,94 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <translation>Kunde inte ansluta till %1:<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation>Fel: Ogiltiga inloggningsuppgifter.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Lokal synkmapp %1 finns redan, aktiverar den för synk.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Skapar lokal synkmapp %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>misslyckades.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>Kunde inte skapa lokal mapp %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>Fjärrmappen kunde inte nås!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>skapar mapp på ownCloud: %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Fjärrmapp %1 har skapats.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Skapande av mapp resulterade i HTTP felkod %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!<br/>Vänligen återvänd och kontrollera dina rättigheter.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Vänligen kontrollera dina inloggningsuppgifter.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Ansluten till %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation> </message> @@ -1575,69 +1426,6 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Ny fil tillgänglig</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' har synkroniserats till denna dator.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Nya filer finns tillgängliga</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' och %n andra fil(er) har synkroniserats till denna dator.</numerusform><numerusform>'%1' och %n andra fil(er) har synkroniserats till denna dator.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Filen raderad</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' har tagits bort.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Filerna är borttagna.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' och %n andra fil(er) har tagits bort.</numerusform><numerusform>'%1' och %n andra fil(er) har tagits bort.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Filen är uppdaterad</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' har uppdaterats.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Filer uppdaterade</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' och %n andra fil(er) har uppdaterats.</numerusform><numerusform>'%1' och %n andra fil(er) har uppdaterats.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1646,8 +1434,8 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> - <translation>%1 Inställningar</translation> + <source>%1</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="52"/> @@ -1919,7 +1707,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Textetikett</translation> </message> @@ -1973,7 +1761,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Skriv in webbadressen till den ownCloudserver du vill ansluta till (utan http eller https).</translation> </message> @@ -2014,13 +1802,13 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>Server &Adress</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2036,7 +1824,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>Error Label</translation> </message> @@ -2213,12 +2001,12 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation>Systemfältet är inte tillgängligt</translation> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation>%1 krävs på ett fungerande systemfält. Om du kör XFCE, vänligen följ <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">dessa instruktioner</a>. Annars, vänligen installera ett systemfälts-program som 'trayer' och försök igen.</translation> </message> diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index f43b20b48..7d7544486 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -7,22 +7,17 @@ <translation>แบบฟอร์ม</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>เชื่อมข้อมูลไดเร็กทอรี่</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>เลือกโฟลเดอร์ที่ต้องการเชื่อมข้อมูลบนเครื่องคอมพิวเตอร์ของคุณ</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&เลือก...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&ชื่อนามแฝงของไดเร็กทอรี่:</translation> </message> @@ -35,32 +30,27 @@ <translation>แบบฟอร์ม</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>ปลายทางที่ต้องการเชื่อมข้อมูล</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>เพิ่มโฟลเดอร์</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>รีเฟรช</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>เพิ่มการซิงค์ข้อมูล...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>หยุดชั่วคราว</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>ลบออก</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>ข้อมูล...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>ยืนยันการลบโฟลเดอร์</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>กำลังตรวจสอบ %1 การเชื่อมต่อ</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>การซิงค์ข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>ล้มเหลวในการเชื่อมต่อไปที่ %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>การซิงค์ข้อมูล %1 เริ่มต้นแล้ว</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>ช่วยเหลือ</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>ออก</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>ไฟล์</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>นับจำนวนไฟล์</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>คัดลอก</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>โปรโตคอลที่ใช้ในการผสานข้อมูล</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>ไม่สามารถระบุสถานะโฟลเดอร์ได้</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>โฟลเดอร์ดังกล่าวกำลังรอการผสานข้อมูล</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>เซิร์ฟเวอร์ไม่สามารถใช้งานได้ในขณะนี้</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>การผสานข้อมูลกำลังทำงานอยู่</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>การผสานข้อมูลครั้งสุดท้ายเสร็จสมบูรณ์</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>ข้อผิดพลาดจากการผสานข้อมูล</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>ข้อผิดพลาดจากการติดตั้ง</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>ไม่สามารถระบุสถานข้อผิดพลาดได้</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>ไฟล์ที่ผสานข้อมูลแล้ว</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>ไฟล์ใหม่</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>ไฟล์ที่ลบทิ้ง</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>ไฟล์ที่เปลี่ยนชื่อ</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>ไฟล์ที่ถูกเพิกเฉย</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>ข้อผิดพลาด</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>ความขัดแย้ง</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> <translation type="unfinished"/> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>ข้อผิดพลาด</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>หัวข้อ CSync สิ้นสุดลงแล้ว</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>รอการเริ่มต้นซิงค์ข้อมูล</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>การซิงค์ข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 ตัวช่วยสร้างโฟลเดอร์</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>ขนาด</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>สถานะโฟลเดอร์ยังไม่ได้ถูกกำหนด</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>โฟลเดอร์ดังกล่าวกำลังรอการซิงค์ข้อมูล</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>การซิงค์ข้อมูลกำลังทำงาน</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>การซิงค์ข้อมูลเกิดข้อผิดพลาด</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>ไม่สามารถระบุข้อผิดพลาดได้</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>บันทึกข้อมูลผลลัพธ์</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&ค้นหา</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&ค้น</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>ล้างข้อมูล</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>ล้างข้อมูลบันทึกการเปลี่ยนแปลงที่แสดงอยู่</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>&บันทึก</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>บันทึกไฟล์บันทึกการเปลี่ยนแปลงไปที่ไฟล์ที่อยู่ดิสก์เพื่อตรวจสอบข้อผิดพลาด</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>ข้อผิดพลาด</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>ไฟล์ '%1'<br/>ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้.<br/><br/>บันทึกผลลัพธ์ <b>ไม่สามารถ</b> บันทึกข้อมูลได้!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>บันทึกข้อมูลไฟล์ log</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>ไม่สามารถเขียนข้อมูลไปไว้ที่ log ไฟล์ได้</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>โฟลเดอร์ภายในเครื่องสำหรับผสานข้อมูล %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>โฟลเดอร์สำหรับถ่ายโอนข้อมูลภายในเครื่อง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล <br/<br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>กำลังสร้างโฟลเดอร์สำหรับโอนถ่ายข้อมูลภายในเครื่อง %1 ...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ตกลง</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>ล้มเหลว</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>โฟลเดอร์ระยะไกล %1 ถูกสร้างเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>โฟลเดอร์ระยะไกล %1 มีอยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">การสร้างโฟลเดอร์ระยะไกลล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.</font><br/>กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>การเชื่อมต่อเผื่อผสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>มีไฟล์ใหม่ที่สามารถใช้งานได้</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' ได้ถูกผสานข้อมูลกับเครื่องนี้แล้ว</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>มีไฟล์ใหม่ที่สามารถใช้งานได้</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' และ ไฟล์อื่นๆ %n ไฟล์ได้ถูกผสานข้อมูลกับเครื่องนี้แล้ว.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>ไฟล์ถูกลบ</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' ได้ถูกลบแล้ว</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' และ ไฟล์อื่นๆ %n ไฟล์ได้ถูกลบเรียบร้อยแล้ว</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' ได้ปรับข้อมูลใหม่แล้ว</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' และ ไฟล์อื่นๆ %n ไฟล์ได้รับการปรับปรุงเรียบร้อยแล้ว</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>กรอกที่อยู่ url ของ ownCloud ที่คุณต้องการเชื่อมต่อ (ไม่ต้องมี http: หรือ https)</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation type="unfinished"/> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index 7803d0f8d..e7a9f6071 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -7,22 +7,17 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>Синхронізовані каталоги</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>Оберіть локальну теку на вашому ПК для синхронізації:</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>&Вибір...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&Псевдонім каталогу:</translation> </message> @@ -35,32 +30,27 @@ <translation>Форма</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>Цільова тека синхронізації</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>Додати Теку</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>Оновити</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>Мітка</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>Додати синхронізацію...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>Пауза</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>Видалити</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>Інформація...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>Відновлення</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>Підтвердіть видалення каталогу</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>Перевірка %1 підключення...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>Жодного %1 підключення не налаштовано.</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>Виконується синхронізація</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation> </message> @@ -209,150 +189,150 @@ <translation><p>Не вдалося підключитись до %1: <tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 синхронізація розпочата</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <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/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>Допомога</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>Вийти</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>Керовані теки:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>Жодна тека не налаштована для синхронізації.</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>Мітка</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>Файли</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>Кількість Файлів</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>Копіювати</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>Протокол Синхронізації</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>Локальна тека %1 не існує.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>Невизначений стан теки</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 повинна бути текою, але нею не є.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>Тека очікує на початок синхронізації.</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 не читається.</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>Сервер зараз недоступний.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>Синхронізація запущена</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>Остання синхронізація була неуспішна.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>Помилка синхронізації.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>Помилка налаштування.</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>Невизначена помилка.</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>Скопійовано в буфер обміну</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>Протокол синхронізації був скопійований в буфер обміну.</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>Синхронізовано Файлів</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>Нових Файлів</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>Видалено Файлів</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>Переіменовано Файлів</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>Проігноровано Файлів</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>Помилок</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>Конфліктів</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>Вивантажено</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>Завантажено</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>Локальна тека %1 не існує.</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 повинна бути текою, але нею не є.</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 не читається.</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync процес відмінено.</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>Невизначений стан.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>Очікування початку синхронізації.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>Синхронізація запущена.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>Остання синхронізація була успішною.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>Помилка установки.</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>Тековий Майстер %1</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>Мітка</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>Розмір</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>Невизначений стан каталогу</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>Каталог очикує початку синхронізації.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>Синхронізація запущена.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>Остання синхронізація була успішною.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>Помилка синхронізації.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>Помилка установки.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>Невизначена помилка.</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>Вивід журналу</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&Пошук: </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&Знайти</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>Очистити</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>Очистити дисплей журналу.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>З&берегти</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>Зберегти файл журналу у файл на диску для обробки.</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>Файл '%1'<br/>не вдається відкрити на запис.<br/><br/>Журнал <b>не</b> можливо зберегти!</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>Зберегти файл журналу</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>Не вдалося записати файл журналу</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Локальна тека синхронізації %1 вже існує, налаштування її для синхронізації.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>Створення локальної теки для синхронізації %1... </translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>не вдалося.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>Віддалена тека %1 успішно створена.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>Віддалена тека %1 вже існує. Під'єднання для синхронізації.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Створення теки завершилось HTTP помилкою %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">Створити віддалену теку не вдалося, можливо, через невірно вказані облікові дані.</font><br/>Будь ласка, поверніться назад та перевірте облікові дані.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Не вдалося створити віддалену теку %1 через помилку <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>З'єднання для синхронізації %1 з віддаленою текою %2 було встановлено.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>Успішно під'єднано до %1!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз.</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>Є новий файл</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' синхронізовано з цією машиною.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>Є нові файли</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' та %n інших файлів було синхронізовано з цим комп'ютером.</numerusform><numerusform>'%1' та %n інших файлів було синхронізовано з цим комп'ютером.</numerusform><numerusform>'%1' та %n інших файлів було синхронізовано з цим комп'ютером.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>Файл видалено</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' було видалено.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>Файлів видалено</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' та %n інших файлів було видалено.</numerusform><numerusform>'%1' та %n інших файлів було видалено.</numerusform><numerusform>'%1' та %n інших файлів було видалено.</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>Файл оновлено</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' було оновлено.</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>Файлів оновлено</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' та %n інших файлів було оновлено.</numerusform><numerusform>'%1' та %n інших файлів було оновлено.</numerusform><numerusform>'%1' та %n інших файлів було оновлено.</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>Мітка</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>Введіть адресу ownCloud, до якого Ви бажаєте підключитись (без http чи https).</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation type="unfinished"/> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation type="unfinished"/> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation type="unfinished"/> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index fc3c9db5d..58949f4fe 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -7,22 +7,17 @@ <translation>窗体</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>同步目录</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>选择一个进行同步的本地文件夹</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>选择(&C)...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>&目录别名:</translation> </message> @@ -35,32 +30,27 @@ <translation>窗体</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>同步目标</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>选择目标文件夹</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>添加目录</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>刷新</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>文本标签</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>新增同步</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>暂停</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>信息……</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>继续</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>确认移除文件夹</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>检查 %1 连接...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>没有 %1 连接配置。</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>同步正在运行</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在执行同步。<br />您确定要关闭它吗？</translation> </message> @@ -209,150 +189,150 @@ <translation><p>连接到 %1 失败：<tt>%2</tt></p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1 同步已启动</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>退出</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>管理的文件夹：</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation>文件夹 %1: %2</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>没有已配置的同步文件夹。</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>文件</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>文件计数</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>复制</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>同步协议</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>未定义的文件夹状态</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>文件夹等待同步开始。</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>确定要同步哪些文件。</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>本地文件夹 %1 不存在。</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>服务器当前不可用。</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>%1 应为目录但并不是。</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>同步正在运行。</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 不可读。</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>上一次同步是成功的。</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>同步出错。</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>设置出错。</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>未定义的错误状态。</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation><numerusform>%1 (最后完成于 %n 秒之前)</numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> - <translation><numerusform>%1 (最后完成于 %n 分钟之前)</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>复制到剪贴板</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>同步协议已经复制到剪贴板。</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>已同步文件</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>新文件</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>已删除文件</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>已重命名文件</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>已忽略文件</translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>错误</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>冲突</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>已上传</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>已下载</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>本地文件夹 %1 不存在。</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>%1 应为目录但并不是。</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 不可读。</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync线程终止</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>未知状态。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>等待启动同步。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>同步正在运行。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>最后一次同步成功。</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 文件夹向导</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>文本标签</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>大小</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>未知文件夹状态</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>文件夹等待同步。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>同步正在运行。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>最后一次同步成功。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>同步失败。</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>安装失败</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>未知错误状态</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>日志输出</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&搜索： </translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&查找</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>清除</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>清空日志显示。</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>保存</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>保存日志文件到磁盘以供调试。</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>文件 '%1'<br/>不能写入。<br/><br/>将<b>不</b>能保存日志输出！</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>保存日志文件</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>无法写到日志文件</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>文件夹更名失败</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation>不能删除或备份文件夹，因为文件夹或其中的一个文件正在被另一个程序打开。请关闭文件或文件夹然后点击重试，或者取消安装。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>连接到 %1：<br/>%2 失败</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>本地同步文件夹 %1 已存在，将使用它来同步。<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>正在创建本地同步文件夹 %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>成功</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>失败</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>不能创建本地文件夹 %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>不能访问远程文件夹！</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>错误：%1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>在 ownCloud 创建文件夹：%1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>远程目录%1成功创建。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>远程文件夹 %1 已存在。连接它以供同步。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>创建文件夹出现 HTTP 错误代码 %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>远程文件夹创建失败，因为提供的凭证有误！<br/>请返回并检查您的凭证。</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">远程文件夹创建失败，可能是由于提供的用户名密码不正确。</font><br/>请返回并检查它们。</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>已经设置了一个 %1 到远程文件夹 %2 的同步连接</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>成功连接到了 %1！</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>无法建立到 %1的链接，请稍后重试</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>新文件可用</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>'%1' 已经同步到本机器。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>新文件可用</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>'%1' 和 %n 个其它文件已被同步到此计算机。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>移除的文件</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1' 已被移除。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>已移除文件</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1' 和 %n 个其它文件已被移除。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>已更新文件</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1' 已更新。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>已更新文件</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1' 和 %n 个其它文件已更新。</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>文本标签</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>输入您想要连接到的 ownCloud 网址 (不带 http 或 https)。</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>服务器地址（&A）</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>错误标签</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index dbcaf9384..b03f1cf16 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -7,22 +7,17 @@ <translation>格式</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/> - <source>Sync Directory</source> - <translation>同步目錄</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/> - <source>Pick a local folder on your computer to sync:</source> - <translation>選擇一個進行同步的本地資料夾</translation> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/> + <source>Pick a local folder on your computer to sync</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="43"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/> <source>&Choose...</source> <translation>選擇(&C)...</translation> </message> <message> - <location filename="../src/mirall/folderwizardsourcepage.ui" line="54"/> + <location filename="../src/mirall/folderwizardsourcepage.ui" line="55"/> <source>&Directory alias name:</source> <translation>目錄別名(&D): </translation> </message> @@ -35,32 +30,27 @@ <translation>表格</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="29"/> - <source>Synchronization Target</source> - <translation>同步目標</translation> - </message> - <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="51"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="131"/> <source>Select a destination folder</source> <translation>選擇目標資料夾</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="63"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="143"/> <source>Add Folder</source> <translation>新增資料夾</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="83"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="163"/> <source>Refresh</source> <translation>重新整理</translation> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="97"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="177"/> <source>Folders</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderwizardtargetpage.ui" line="195"/> + <location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> @@ -83,108 +73,98 @@ <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="39"/> - <source>Remove Account</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="46"/> + <location filename="../src/mirall/accountsettings.ui" line="36"/> <source>Modify Account</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="56"/> + <location filename="../src/mirall/accountsettings.ui" line="59"/> <source>Sync Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="62"/> + <location filename="../src/mirall/accountsettings.ui" line="65"/> <source>Connected with <server> as <user></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="74"/> - <source>Add Sync...</source> - <translation>增加同步...</translation> - </message> - <message> - <location filename="../src/mirall/accountsettings.ui" line="81"/> - <location filename="../src/mirall/accountsettings.cpp" line="98"/> + <location filename="../src/mirall/accountsettings.ui" line="84"/> + <location filename="../src/mirall/accountsettings.cpp" line="100"/> <source>Pause</source> <translation>暫停</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="101"/> + <location filename="../src/mirall/accountsettings.ui" line="91"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="108"/> - <source>Reset</source> + <location filename="../src/mirall/accountsettings.ui" line="77"/> + <source>Add Folder...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="128"/> + <location filename="../src/mirall/accountsettings.ui" line="111"/> <source>Info...</source> <translation>資訊...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="140"/> + <location filename="../src/mirall/accountsettings.ui" line="123"/> <source>Storage Usage</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="159"/> + <location filename="../src/mirall/accountsettings.ui" line="142"/> <source>Retrieving usage information...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.ui" line="166"/> + <location filename="../src/mirall/accountsettings.ui" line="149"/> <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="100"/> + <location filename="../src/mirall/accountsettings.cpp" line="102"/> <source>Resume</source> <translation>繼續</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="240"/> + <location filename="../src/mirall/accountsettings.cpp" line="242"/> <source>Confirm Folder Remove</source> <translation>確認移除資料夾</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="241"/> + <location filename="../src/mirall/accountsettings.cpp" line="243"/> <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="261"/> + <location filename="../src/mirall/accountsettings.cpp" line="263"/> <source>Confirm Folder Reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="262"/> - <source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> While no files will be removed, this can cause significant data traffic and take several minutes to hours, depending on the size of the folder.</p></source> + <location filename="../src/mirall/accountsettings.cpp" line="264"/> + <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="292"/> + <location filename="../src/mirall/accountsettings.cpp" line="296"/> <source>Checking %1 connection...</source> <translation>檢查%1連線...</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="297"/> + <location filename="../src/mirall/accountsettings.cpp" line="301"/> <source>No %1 connection configured.</source> <translation>無%1連線設定</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="358"/> + <location filename="../src/mirall/accountsettings.cpp" line="363"/> <source>Sync Running</source> <translation>同步中</translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="359"/> + <location filename="../src/mirall/accountsettings.cpp" line="364"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在同步中<br/>你真的想要中斷？</translation> </message> @@ -209,150 +189,150 @@ <translation><p>連線到 %1: <tt>%2</tt>失敗</p></translation> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="547"/> + <location filename="../src/mirall/accountsettings.cpp" line="556"/> <source>Start</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="556"/> + <location filename="../src/mirall/accountsettings.cpp" line="565"/> <source>Currently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="563"/> + <location filename="../src/mirall/accountsettings.cpp" line="572"/> <source>Completely</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="595"/> + <location filename="../src/mirall/accountsettings.cpp" line="604"/> <source>%1 %2 %3 (%4 of %5)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="598"/> + <location filename="../src/mirall/accountsettings.cpp" line="607"/> <source>Completely finished.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="605"/> + <location filename="../src/mirall/accountsettings.cpp" line="614"/> <source>%1 of %2, file %3 of %4</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/accountsettings.cpp" line="646"/> - <source>You are using %1 of your available %2 storage.</source> + <location filename="../src/mirall/accountsettings.cpp" line="655"/> + <source>%1 of %2 in use.</source> <translation type="unfinished"/> </message> </context> <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="246"/> <source>%1 Sync Started</source> <translation>%1同步已經開始</translation> </message> <message numerus="yes"> - <location filename="../src/mirall/application.cpp" line="246"/> + <location filename="../src/mirall/application.cpp" line="247"/> <source>Sync started for %n configured sync folder(s).</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="319"/> <source>Open %1 in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> + <location filename="../src/mirall/application.cpp" line="321"/> <source>Calculating quota...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="323"/> <source>Unknown status</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="324"/> + <location filename="../src/mirall/application.cpp" line="325"/> <source>Settings...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="325"/> + <location filename="../src/mirall/application.cpp" line="326"/> <source>Details...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="330"/> + <location filename="../src/mirall/application.cpp" line="331"/> <source>Help</source> <translation>說明</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="332"/> - <source>Quit</source> - <translation>離開</translation> + <location filename="../src/mirall/application.cpp" line="333"/> + <source>Quit %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="361"/> - <source>None.</source> + <location filename="../src/mirall/application.cpp" line="383"/> + <source>Open %1 folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="365"/> - <source>Recent Changes</source> + <location filename="../src/mirall/application.cpp" line="526"/> + <source>%1% of %2 in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="382"/> - <source>Open local folder '%1'</source> + <location filename="../src/mirall/application.cpp" line="598"/> + <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="392"/> + <location filename="../src/mirall/application.cpp" line="362"/> + <source>None.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="366"/> + <source>Recent Changes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="393"/> <source>Managed Folders:</source> <translation>管理的資料夾:</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="395"/> + <location filename="../src/mirall/application.cpp" line="396"/> <source>Open folder '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="518"/> + <location filename="../src/mirall/application.cpp" line="519"/> <source>Quota n/a</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="525"/> - <source>%1% of %2 used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="551"/> + <location filename="../src/mirall/application.cpp" line="552"/> <source>No items synced recently</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="560"/> + <location filename="../src/mirall/application.cpp" line="561"/> <source>%1 (%2, %3)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="575"/> + <location filename="../src/mirall/application.cpp" line="576"/> <source>Syncing %1 of %2 (%3 of %4) </source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="597"/> - <source>In Sync</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="813"/> + <location filename="../src/mirall/application.cpp" line="814"/> <source>Folder %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/application.cpp" line="819"/> + <location filename="../src/mirall/application.cpp" line="820"/> <source>No sync folders configured.</source> <translation>無已配置的同步資料夾</translation> </message> @@ -527,211 +507,127 @@ </message> </context> <context> - <name>Mirall::FileItemDialog</name> - <message> - <location filename="../src/mirall/fileitemdialog.ui" line="14"/> - <source>Form</source> - <translation>格式</translation> - </message> + <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="27"/> - <source>Detailed Sync Protocol</source> + <location filename="../src/mirall/folder.cpp" line="92"/> + <source>Unable to create csync-context</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.ui" line="63"/> - <location filename="../src/mirall/fileitemdialog.ui" line="70"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="43"/> - <source>Files</source> - <translation>檔案</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="44"/> - <source>File Count</source> - <translation>檔案數目</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="52"/> - <source>Copy</source> - <translation>複製</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="55"/> - <source>Sync Protocol</source> - <translation>同步協定</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="71"/> - <source>Undefined Folder State</source> - <translation>未定義的資料夾狀態</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="74"/> - <source>The folder waits to start syncing.</source> - <translation>資料夾等待同步開始。</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="77"/> - <source>Determining which files to sync.</source> - <translation>正在決定要同步哪些檔案。</translation> + <location filename="../src/mirall/folder.cpp" line="142"/> + <source>Local folder %1 does not exist.</source> + <translation>本地資料夾 %1 不存在</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="80"/> - <source>Server is currently not available.</source> - <translation>伺服器目前無法使用。</translation> + <location filename="../src/mirall/folder.cpp" line="145"/> + <source>%1 should be a directory but is not.</source> + <translation>資料夾不存在, %1 必須是資料夾</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="83"/> - <source>Sync is running.</source> - <translation>同步中。</translation> + <location filename="../src/mirall/folder.cpp" line="148"/> + <source>%1 is not readable.</source> + <translation>%1 是不可讀的</translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="86"/> - <source>Last Sync was successful.</source> - <translation>上次的同步成功。</translation> + <location filename="../src/mirall/folder.cpp" line="288"/> + <source>File %1: %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="89"/> - <source>Syncing Error.</source> - <translation>同步錯誤。</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>New file available</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="92"/> - <source>Setup Error.</source> - <translation>設定錯誤。</translation> + <location filename="../src/mirall/folder.cpp" line="330"/> + <source>'%1' has been synced to this machine.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="95"/> - <source>Undefined Error State.</source> - <translation>未定義的錯誤狀態。</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="132"/> - <source>%1 (last finished %n sec. ago)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>New files available</source> + <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../src/mirall/fileitemdialog.cpp" line="134"/> - <source>%1 (last finished %n min. ago)</source> + <location filename="../src/mirall/folder.cpp" line="332"/> + <source>'%1' and %n other file(s) have been synced to this machine.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>Copied to clipboard</source> - <translation>複製至剪貼簿中</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="163"/> - <source>The sync protocol has been copied to the clipboard.</source> - <translation>同步協定已複製至剪貼簿</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="180"/> - <source>Synced Files</source> - <translation>已同步的檔案</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="186"/> - <source>New Files</source> - <translation>新檔案</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="192"/> - <source>Deleted Files</source> - <translation>已刪除的檔案</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="198"/> - <source>Renamed Files</source> - <translation>已更名的檔案</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="204"/> - <source>Ignored Files</source> - <translation>忽略的檔案</translation> - </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="210"/> - <source>Errors</source> - <translation>錯誤</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>File removed</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="216"/> - <source>Conflicts</source> - <translation>衝突</translation> + <location filename="../src/mirall/folder.cpp" line="338"/> + <source>'%1' has been removed.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="236"/> - <source>Uploaded</source> - <translation>已上傳</translation> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>Files removed</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/fileitemdialog.cpp" line="237"/> - <source>Downloaded</source> - <translation>已下載</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="340"/> + <source>'%1' and %n other file(s) have been removed.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> -</context> -<context> - <name>Mirall::Folder</name> <message> - <location filename="../src/mirall/folder.cpp" line="95"/> - <source>Unable to create csync-context</source> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>File updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="145"/> - <source>Local folder %1 does not exist.</source> - <translation>本地資料夾 %1 不存在</translation> + <location filename="../src/mirall/folder.cpp" line="346"/> + <source>'%1' has been updated.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="148"/> - <source>%1 should be a directory but is not.</source> - <translation>資料夾不存在, %1 必須是資料夾</translation> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>Files updated</source> + <translation type="unfinished"/> </message> - <message> - <location filename="../src/mirall/folder.cpp" line="151"/> - <source>%1 is not readable.</source> - <translation>%1 是不可讀的</translation> + <message numerus="yes"> + <location filename="../src/mirall/folder.cpp" line="348"/> + <source>'%1' and %n other file(s) have been updated.</source> + <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="314"/> + <location filename="../src/mirall/folder.cpp" line="390"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="343"/> + <location filename="../src/mirall/folder.cpp" line="419"/> <source>The CSync thread terminated.</source> <translation>CSync 執行緒終止</translation> </message> <message> - <location filename="../src/mirall/folder.cpp" line="651"/> + <location filename="../src/mirall/folder.cpp" line="659"/> <source>This sync would remove all the files in the local sync folder '%1'. If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="654"/> + <location filename="../src/mirall/folder.cpp" line="662"/> <source>This sync would remove all the files in the sync folder '%1'. This might be because the folder was silently reconfigured, or that all the file were manually removed. Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="658"/> + <location filename="../src/mirall/folder.cpp" line="666"/> <source>Remove All Files?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="660"/> + <location filename="../src/mirall/folder.cpp" line="668"/> <source>Remove all files</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folder.cpp" line="661"/> + <location filename="../src/mirall/folder.cpp" line="669"/> <source>Keep files</source> <translation type="unfinished"/> </message> @@ -749,47 +645,47 @@ Are you sure you want to perform this operation?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="562"/> + <location filename="../src/mirall/folderman.cpp" line="566"/> <source>Undefined State.</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="565"/> + <location filename="../src/mirall/folderman.cpp" line="569"/> <source>Waits to start syncing.</source> <translation>等待啟動同步</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="568"/> + <location filename="../src/mirall/folderman.cpp" line="572"/> <source>Preparing for sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="571"/> + <location filename="../src/mirall/folderman.cpp" line="575"/> <source>Sync is running.</source> <translation>同步執行中</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="574"/> + <location filename="../src/mirall/folderman.cpp" line="578"/> <source>Server is currently not available.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="577"/> + <location filename="../src/mirall/folderman.cpp" line="581"/> <source>Last Sync was successful.</source> <translation>最後一次同步成功</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="582"/> + <location filename="../src/mirall/folderman.cpp" line="586"/> <source>Last Sync was successful, but with warnings on individual files.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="585"/> + <location filename="../src/mirall/folderman.cpp" line="589"/> <source>Setup Error.</source> <translation>安裝失敗</translation> </message> <message> - <location filename="../src/mirall/folderman.cpp" line="591"/> + <location filename="../src/mirall/folderman.cpp" line="595"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"/> </message> @@ -798,7 +694,7 @@ Are you sure you want to perform this operation?</source> <name>Mirall::FolderStatusDelegate</name> <message> <location filename="../src/mirall/folderstatusmodel.cpp" line="91"/> - <location filename="../src/mirall/folderstatusmodel.cpp" line="248"/> + <location filename="../src/mirall/folderstatusmodel.cpp" line="245"/> <source>File</source> <translation type="unfinished"/> </message> @@ -827,8 +723,9 @@ documentation for possible fixes.</source> <name>Mirall::FolderWizard</name> <message> <location filename="../src/mirall/folderwizard.cpp" line="361"/> - <source>%1 Folder Wizard</source> - <translation>%1 資料夾精靈</translation> + <location filename="../src/mirall/folderwizard.cpp" line="363"/> + <source>Add Folder</source> + <translation type="unfinished"/> </message> </context> <context> @@ -1023,186 +920,140 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/itemprogressdialog.ui" line="73"/> - <location filename="../src/mirall/itemprogressdialog.ui" line="80"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="53"/> - <source>Folder/Time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="54"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="44"/> <source>File</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="55"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="46"/> <source>Action</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="47"/> <source>Size</source> <translation>大小</translation> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="64"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="56"/> <source>Copy</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="67"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="59"/> <source>Sync Protocol</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="78"/> - <source>Undefined Folder State</source> - <translation>未知資料夾狀態</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="81"/> - <source>The folder waits to start syncing.</source> - <translation>資料夾等待同步</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="84"/> - <source>Determining which files to sync.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="43"/> + <source>Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="87"/> - <source>Server is currently not available.</source> + <location filename="../src/mirall/itemprogressdialog.cpp" line="45"/> + <source>Folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="90"/> - <source>Sync is running.</source> - <translation>同步執行中</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="93"/> - <source>Last Sync was successful.</source> - <translation>最後一次同步成功</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="96"/> - <source>Syncing Error.</source> - <translation>同步失敗</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="99"/> - <source>Setup Error.</source> - <translation>安裝失敗</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="102"/> - <source>Sync success, but warnings on individual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="105"/> - <source>Undefined Error State.</source> - <translation>未知的錯誤狀態</translation> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="108"/> - <source>%1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="153"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="116"/> <source>File ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="155"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="118"/> <source>Directory ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="157"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="120"/> <source>Soft Link ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="159"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="122"/> <source>Ignored.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>Copied to clipboard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="245"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="209"/> <source>The sync protocol has been copied to the clipboard.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/itemprogressdialog.cpp" line="330"/> + <location filename="../src/mirall/itemprogressdialog.cpp" line="261"/> <source>Problem: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/mirall/itemprogressdialog.cpp" line="264"/> + <source>No more storage space available on server.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>Mirall::LogBrowser</name> <message> - <location filename="../src/mirall/logbrowser.cpp" line="64"/> + <location filename="../src/mirall/logbrowser.cpp" line="59"/> <source>Log Output</source> <translation>記錄輸出</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="76"/> + <location filename="../src/mirall/logbrowser.cpp" line="71"/> <source>&Search: </source> <translation>&搜尋:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="84"/> + <location filename="../src/mirall/logbrowser.cpp" line="79"/> <source>&Find</source> <translation>&尋找:</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="102"/> + <location filename="../src/mirall/logbrowser.cpp" line="97"/> <source>Clear</source> <translation>清除</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="103"/> + <location filename="../src/mirall/logbrowser.cpp" line="98"/> <source>Clear the log display.</source> <translation>清除所顯示的記錄</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="109"/> + <location filename="../src/mirall/logbrowser.cpp" line="104"/> <source>S&ave</source> <translation>儲存</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="110"/> + <location filename="../src/mirall/logbrowser.cpp" line="105"/> <source>Save the log file to a file on disk for debugging.</source> <translation>將記錄檔儲存到硬碟用於除錯</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="151"/> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="160"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="152"/> + <location filename="../src/mirall/logbrowser.cpp" line="161"/> <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source> <translation><nobr>檔案 '%1'<br/>無法開啟與寫入<br/><br/>記錄 <b>無法</b> 被儲存</nobr></translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="197"/> + <location filename="../src/mirall/logbrowser.cpp" line="206"/> <source>Save log file</source> <translation>儲存記錄檔</translation> </message> <message> - <location filename="../src/mirall/logbrowser.cpp" line="207"/> + <location filename="../src/mirall/logbrowser.cpp" line="216"/> <source>Could not write to log file </source> <translation>無法寫入記錄檔</translation> </message> @@ -1400,17 +1251,17 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>Mirall::OwncloudSetupWizard</name> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="497"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="490"/> <source>Folder rename failed</source> <translation>重新命名資料夾失敗</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="498"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="491"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="518"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="507"/> <source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source> <translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation> </message> @@ -1435,94 +1286,94 @@ Checked items will also be deleted if they prevent a directory from being remove <translation>無法連線到 %1 ：<br/>%2</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="296"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="291"/> <source>Error: Wrong credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>本地同步資料夾%1已存在, 將其設置為同步<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/> <source>Creating local sync folder %1... </source> <translation>建立本地同步資料夾 %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> <source>failed.</source> <translation>失敗</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source>Could not create local folder %1</source> <translation>無法建立本地資料夾 %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/> <source>The remote folder could not be accessed!</source> <translation>無法存取遠端資料夾！</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="364"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="359"/> <source>Error: %1</source> <translation>錯誤： %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> <source>creating folder on ownCloud: %1</source> <translation>在 ownCloud 建立資料夾： %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="398"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="393"/> <source>Remote folder %1 created successfully.</source> <translation>遠端資料夾%1建立成功!</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="400"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="395"/> <source>The remote folder %1 already exists. Connecting it for syncing.</source> <translation>遠端資料夾%1已存在,連線同步中</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="402"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="397"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="399"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>在HTTP建立資料夾失敗, error code %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="406"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="401"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>由於帳號或密碼錯誤，遠端資料夾建立失敗<br/>請檢查您的帳號密碼。</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="404"/> <source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source> <translation><p><font color="red">遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤</font><br/>請重新檢查您的帳號密碼</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="409"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="410"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="426"/> <source>A sync connection from %1 to remote directory %2 was set up.</source> <translation>從%1到遠端資料夾%2的連線已建立</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="436"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/> <source>Successfully connected to %1!</source> <translation>成功連接到 %1 ！</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="442"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> <source>Connection to %1 could not be established. Please check again.</source> <translation>無法建立連線%1, 請重新檢查</translation> </message> @@ -1569,69 +1420,6 @@ Checked items will also be deleted if they prevent a directory from being remove </message> </context> <context> - <name>Mirall::ServerActionNotifier</name> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>New file available</source> - <translation>新的可用檔案</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="625"/> - <source>'%1' has been synced to this machine.</source> - <translation>%1 已經被同步到這台機器。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>New files available</source> - <translation>新的可用檔案</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="627"/> - <source>'%1' and %n other file(s) have been synced to this machine.</source> - <translation><numerusform>%1 和 %n 個其他檔案已經被同步到這台機器。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>File removed</source> - <translation>文件已被移除</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="633"/> - <source>'%1' has been removed.</source> - <translation>'%1'已被移除。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>Files removed</source> - <translation>檔案已移除</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="635"/> - <source>'%1' and %n other file(s) have been removed.</source> - <translation><numerusform>'%1'和其他%n個文件已被移除。</numerusform></translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>File updated</source> - <translation>檔案已上傳</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="641"/> - <source>'%1' has been updated.</source> - <translation>'%1'已被更新。</translation> - </message> - <message> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>Files updated</source> - <translation>檔案已上傳</translation> - </message> - <message numerus="yes"> - <location filename="../src/mirall/folder.cpp" line="643"/> - <source>'%1' and %n other file(s) have been updated.</source> - <translation><numerusform>'%1'和其他%n個文件已被更新。</numerusform></translation> - </message> -</context> -<context> <name>Mirall::SettingsDialog</name> <message> <location filename="../src/mirall/settingsdialog.ui" line="14"/> @@ -1640,7 +1428,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/settingsdialog.cpp" line="49"/> - <source>%1 Settings</source> + <source>%1</source> <translation type="unfinished"/> </message> <message> @@ -1913,7 +1701,7 @@ Checked items will also be deleted if they prevent a directory from being remove <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="35"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="444"/> <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="105"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="140"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> @@ -1967,7 +1755,7 @@ Checked items will also be deleted if they prevent a directory from being remove <message> <location filename="../src/mirall/owncloudsetuppage.ui" line="147"/> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="270"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="60"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="79"/> <source>Enter the url of the ownCloud you want to connect to (without http or https).</source> <translation>輸入欲連線的ownCloud的url(不需要輸入http或http)</translation> </message> @@ -2008,13 +1796,13 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="254"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="44"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> <source>Server &Address</source> <translation>伺服器位址</translation> </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="273"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="63"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="82"/> <source>https://...</source> <translation>https://...</translation> </message> @@ -2030,7 +1818,7 @@ Checked items will also be deleted if they prevent a directory from being remove </message> <message> <location filename="../src/mirall/owncloudsetuppage_ng.ui" line="347"/> - <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="78"/> + <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="113"/> <source>Error Label</source> <translation>錯誤標籤</translation> </message> @@ -2207,12 +1995,12 @@ Checked items will also be deleted if they prevent a directory from being remove <context> <name>main.cpp</name> <message> - <location filename="../src/main.cpp" line="38"/> + <location filename="../src/main.cpp" line="43"/> <source>System Tray not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/main.cpp" line="39"/> + <location filename="../src/main.cpp" line="44"/> <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source> <translation type="unfinished"/> </message> |