diff options
| author | Jenkins for ownCloud <thomas.mueller@tmit.eu> | 2012-09-25 04:07:37 +0400 |
|---|---|---|
| committer | Jenkins for ownCloud <thomas.mueller@tmit.eu> | 2012-09-25 04:07:37 +0400 |
| commit | 2d87466217dc6da1a34ba547c5083fa82e0dddd1 (patch) | |
| tree | 7d0b89e3ae1a1cf5f0185316ccbf96c4a256d0e8 /translations/mirall_en.ts | |
| parent | bcf9bb823896852d70a785d69f7295bfdecdadab (diff) | |
[tx-robot] updated from transifex
Diffstat (limited to 'translations/mirall_en.ts')
| -rw-r--r-- | translations/mirall_en.ts | 392 |
1 files changed, 238 insertions, 154 deletions
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 81154d3a7..4a42b7ded 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -265,107 +265,78 @@ p, li { white-space: pre-wrap; } <context> <name>Mirall::Application</name> <message> - <location filename="../src/mirall/application.cpp" line="199"/> <source>No ownCloud Configuration</source> - <translation>No ownCloud Configuration</translation> + <translation type="obsolete">No ownCloud Configuration</translation> </message> <message> <source><p>No ownCloud connection was configured yet.</p><p>Please configure one by clicking on the tray icon!</p></source> <translation type="obsolete"><p>No ownCloud connection was configured yet.</p><p>Please configure one by clicking on the tray icon!</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="200"/> - <source><p>No server connection has been configured for this ownCloud client.</p><p>Please right click on the ownCloud system tray icon and select <i>Configure</i> to connect this client to an ownCloud server.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="226"/> - <source>ownCloud Server Mismatch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="227"/> - <source><p>The configured server for this client is too old.</p><p>Please update to the latest ownCloud server and restart the client.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="242"/> <source><p>The ownCloud at %1 could not be reached.</p></source> - <translation><p>The ownCloud at %1 could not be reached.</p></translation> + <translation type="obsolete"><p>The ownCloud at %1 could not be reached.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="243"/> + <location filename="../src/mirall/application.cpp" line="236"/> <source><p>The detailed error message is<br/><tt>%1</tt></p></source> <translation><p>The detailed error message is<br/><tt>%1</tt></p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="245"/> + <location filename="../src/mirall/application.cpp" line="238"/> <source><p>Please check your configuration by clicking on the tray icon.</p></source> <translation><p>Please check your configuration by clicking on the tray icon.</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="247"/> <source>ownCloud Connection Failed</source> - <translation>ownCloud Connection Failed</translation> + <translation type="obsolete">ownCloud Connection Failed</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="275"/> - <location filename="../src/mirall/application.cpp" line="282"/> <source>No ownCloud Connection</source> - <translation>No ownCloud Connection</translation> + <translation type="obsolete">No ownCloud Connection</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="276"/> <source><p>Your ownCloud credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></source> - <translation><p>Your ownCloud credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></translation> + <translation type="obsolete"><p>Your ownCloud credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="283"/> <source><p>Your ownCloud user name or password is not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></source> - <translation><p>Your ownCloud user name or password is not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></translation> + <translation type="obsolete"><p>Your ownCloud user name or password is not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="295"/> <source>ownCloud Sync Started</source> - <translation>ownCloud Sync Started</translation> + <translation type="obsolete">ownCloud Sync Started</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="295"/> + <location filename="../src/mirall/application.cpp" line="290"/> <source>Sync started for %1 configured sync folder(s).</source> <translation>Sync started for %1 configured sync folder(s).</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="310"/> <source>Open ownCloud...</source> - <translation>Open ownCloud...</translation> + <translation type="obsolete">Open ownCloud...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="312"/> + <location filename="../src/mirall/application.cpp" line="307"/> <source>Open status...</source> <translation>Open status...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="314"/> + <location filename="../src/mirall/application.cpp" line="309"/> <source>Add folder...</source> <translation>Add folder...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="316"/> + <location filename="../src/mirall/application.cpp" line="311"/> <source>Configure...</source> <translation>Configure...</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="318"/> + <location filename="../src/mirall/application.cpp" line="313"/> <source>Configure proxy...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="320"/> - <source>&About...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/mirall/application.cpp" line="322"/> + <location filename="../src/mirall/application.cpp" line="317"/> <source>Quit</source> <translation>Quit</translation> </message> @@ -374,22 +345,83 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">open folder %1</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="367"/> + <location filename="../src/mirall/application.cpp" line="192"/> + <source>No %1 Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="193"/> + <source><p>No server connection has been configured for this %1 client.</p><p>Please right click on the ownCloud system tray icon and select <i>Configure</i> to connect this client to an ownCloud server.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="219"/> + <source>%1 Server Mismatch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="220"/> + <source><p>The configured server for this client is too old.</p><p>Please update to the latest %1 server and restart the client.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="235"/> + <source><p>The %1 at %2 could not be reached.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="240"/> + <source>%1 Connection Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="268"/> + <location filename="../src/mirall/application.cpp" line="276"/> + <source>No %1 Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="269"/> + <source><p>Your %1 credentials are not correct.</p><p>Please correct them by starting the configuration dialog from the tray!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="277"/> + <source><p>Either your user name or your password are not correct.</p><p>Please correct it by starting the configuration dialog from the tray!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="289"/> + <source>%1 Sync Started</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="305"/> + <source>Open %1 in browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="315"/> + <source>About...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/application.cpp" line="362"/> <source>open %1 folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="380"/> + <location filename="../src/mirall/application.cpp" line="375"/> <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="612"/> + <location filename="../src/mirall/application.cpp" line="607"/> <source>About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="613"/> + <location filename="../src/mirall/application.cpp" line="608"/> <source>%1 client, version %2 Copyright 2012, the ownCloud developers @@ -400,113 +432,113 @@ The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRAN <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="626"/> + <location filename="../src/mirall/application.cpp" line="621"/> <source>Confirm Folder Remove</source> <translation>Confirm Folder Remove</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="627"/> + <location filename="../src/mirall/application.cpp" line="622"/> <source>Do you really want to remove upload folder <i>%1</i>?</source> <translation>Do you really want to remove upload folder <i>%1</i>?</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="661"/> + <location filename="../src/mirall/application.cpp" line="656"/> <source>Undefined Folder State</source> <translation>Undefined Folder State</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="664"/> + <location filename="../src/mirall/application.cpp" line="659"/> <source>The folder waits to start syncing.</source> <translation>The folder waits to start syncing.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="667"/> - <location filename="../src/mirall/application.cpp" line="801"/> + <location filename="../src/mirall/application.cpp" line="662"/> + <location filename="../src/mirall/application.cpp" line="796"/> <source>Sync is running.</source> <translation>Sync is running.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="670"/> - <location filename="../src/mirall/application.cpp" line="806"/> + <location filename="../src/mirall/application.cpp" line="665"/> + <location filename="../src/mirall/application.cpp" line="801"/> <source>Last Sync was successful.</source> <translation>Last Sync was successful.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="673"/> - <location filename="../src/mirall/application.cpp" line="812"/> + <location filename="../src/mirall/application.cpp" line="668"/> + <location filename="../src/mirall/application.cpp" line="807"/> <source>Syncing Error.</source> <translation>Syncing Error.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="676"/> - <location filename="../src/mirall/application.cpp" line="818"/> + <location filename="../src/mirall/application.cpp" line="671"/> + <location filename="../src/mirall/application.cpp" line="813"/> <source>Setup Error.</source> <translation>Setup Error.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="679"/> - <location filename="../src/mirall/application.cpp" line="821"/> + <location filename="../src/mirall/application.cpp" line="674"/> + <location filename="../src/mirall/application.cpp" line="816"/> <source>Undefined Error State.</source> <translation>Undefined Error State.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="683"/> + <location filename="../src/mirall/application.cpp" line="678"/> <source>Folder information</source> <translation>Folder information</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="698"/> + <location filename="../src/mirall/application.cpp" line="693"/> <source>Unknown</source> <translation>Unknown</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="700"/> + <location filename="../src/mirall/application.cpp" line="695"/> <source>Changed files: </source> <translation>Changed files: </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="702"/> + <location filename="../src/mirall/application.cpp" line="697"/> <source>Added files: </source> <translation>Added files: </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="704"/> + <location filename="../src/mirall/application.cpp" line="699"/> <source>New files in the server, or files deleted locally: </source> <translation>New files in the server, or files deleted locally: </translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="731"/> + <location filename="../src/mirall/application.cpp" line="726"/> <source>Sync Running</source> <translation>Sync Running</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="732"/> + <location filename="../src/mirall/application.cpp" line="727"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>The syncing operation is running.<br/>Do you want to terminate it?</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="794"/> + <location filename="../src/mirall/application.cpp" line="789"/> <source>Undefined State.</source> <translation>Undefined State.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="797"/> + <location filename="../src/mirall/application.cpp" line="792"/> <source>Waits to start syncing.</source> <translation>Waits to start syncing.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="826"/> + <location filename="../src/mirall/application.cpp" line="821"/> <source>Sync is paused.</source> <translation>Sync is paused.</translation> </message> <message> - <location filename="../src/mirall/application.cpp" line="842"/> + <location filename="../src/mirall/application.cpp" line="837"/> <source>No sync folders configured.</source> <translation>No sync folders configured.</translation> </message> @@ -514,17 +546,17 @@ The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRAN <context> <name>Mirall::CSyncThread</name> <message> - <location filename="../src/mirall/csyncthread.cpp" line="191"/> + <location filename="../src/mirall/csyncthread.cpp" line="190"/> <source>CSync create failed.</source> <translation>CSync create failed.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="227"/> + <location filename="../src/mirall/csyncthread.cpp" line="226"/> <source>CSync failed to create a lock file.</source> <translation>CSync failed to create a lock file.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="230"/> + <location filename="../src/mirall/csyncthread.cpp" line="229"/> <source>CSync failed to load the state db.</source> <translation>CSync failed to load the state db.</translation> </message> @@ -533,17 +565,17 @@ The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRAN <translation type="obsolete">The system time between the local machine and the server differs too much. Please use a time syncronization service (ntp) on both machines.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="233"/> + <location filename="../src/mirall/csyncthread.cpp" line="232"/> <source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="238"/> + <location filename="../src/mirall/csyncthread.cpp" line="237"/> <source>CSync could not detect the filesystem type.</source> <translation>CSync could not detect the filesystem type.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="241"/> + <location filename="../src/mirall/csyncthread.cpp" line="240"/> <source>CSync got an error while processing internal trees.</source> <translation>CSync got an error while processing internal trees.</translation> </message> @@ -552,37 +584,37 @@ The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRAN <translation type="obsolete"><p>The target directory %1 does not exist.</p><p>Please create it and try again.</p></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="244"/> + <location filename="../src/mirall/csyncthread.cpp" line="243"/> <source><p>The target directory %1 does not exist.</p><p>Please check the sync setup.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="250"/> + <location filename="../src/mirall/csyncthread.cpp" line="249"/> <source><p>The ownCloud plugin for csync could not be loaded.<br/>Please verify the installation!</p></source> <translation><p>The ownCloud plugin for csync could not be loaded.<br/>Please verify the installation!</p></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="254"/> + <location filename="../src/mirall/csyncthread.cpp" line="253"/> <source>The local filesystem can not be written. Please check permissions.</source> <translation>The local filesystem can not be written. Please check permissions.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="258"/> + <location filename="../src/mirall/csyncthread.cpp" line="257"/> <source>A remote file can not be written. Please check the remote access.</source> <translation>A remote file can not be written. Please check the remote access.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="261"/> + <location filename="../src/mirall/csyncthread.cpp" line="260"/> <source>An internal error number %1 happend.</source> <translation>An internal error number %1 happend.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="277"/> + <location filename="../src/mirall/csyncthread.cpp" line="276"/> <source>CSync failed to reach the host. Either host or proxy settings are not valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="280"/> + <location filename="../src/mirall/csyncthread.cpp" line="279"/> <source>CSync Update failed.</source> <translation>CSync Update failed.</translation> </message> @@ -595,36 +627,36 @@ That prevents ownCloud from successful syncing. Please make sure that all directories are writeable.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="294"/> + <location filename="../src/mirall/csyncthread.cpp" line="293"/> <source>CSync encountered an error while examining the file system. Syncing is not possible.</source> <translation>CSync encountered an error while examining the file system. Syncing is not possible.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="297"/> + <location filename="../src/mirall/csyncthread.cpp" line="296"/> <source>CSync update generated a strange instruction. Please write a bug report.</source> <translation>CSync update generated a strange instruction. Please write a bug report.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="300"/> + <location filename="../src/mirall/csyncthread.cpp" line="299"/> <source>Local filesystem problems. Better disable Syncing and check.</source> <translation>Local filesystem problems. Better disable Syncing and check.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="305"/> + <location filename="../src/mirall/csyncthread.cpp" line="304"/> <source>The local filesystem has %1 write protected directories.That can hinder successful syncing.<p/>Please make sure that all local directories are writeable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="325"/> + <location filename="../src/mirall/csyncthread.cpp" line="324"/> <source>CSync reconcile failed.</source> <translation>CSync reconcile failed.</translation> </message> <message> - <location filename="../src/mirall/csyncthread.cpp" line="329"/> + <location filename="../src/mirall/csyncthread.cpp" line="328"/> <source>CSync propagate failed.</source> <translation>CSync propagate failed.</translation> </message> @@ -648,7 +680,7 @@ Please write a bug report.</translation> <context> <name>Mirall::FolderWizard</name> <message> - <location filename="../src/mirall/folderwizard.cpp" line="462"/> + <location filename="../src/mirall/folderwizard.cpp" line="466"/> <source>%1 Folder Wizard</source> <translation>%1 Folder Wizard</translation> </message> @@ -694,42 +726,62 @@ Please write a bug report.</translation> <context> <name>Mirall::FolderWizardTargetPage</name> <message> - <location filename="../src/mirall/folderwizard.cpp" line="211"/> <source>The folder is not available on your ownCloud.<br/>Click to let mirall create it.</source> - <translation>The folder is not available on your ownCloud.<br/>Click to let mirall create it.</translation> + <translation type="obsolete">The folder is not available on your ownCloud.<br/>Click to let mirall create it.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="236"/> <source>Folder on ownCloud was successfully created.</source> - <translation>Folder on ownCloud was successfully created.</translation> + <translation type="obsolete">Folder on ownCloud was successfully created.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="239"/> <source>Failed to create the folder on ownCloud.<br/>Please check manually.</source> - <translation>Failed to create the folder on ownCloud.<br/>Please check manually.</translation> + <translation type="obsolete">Failed to create the folder on ownCloud.<br/>Please check manually.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="259"/> + <location filename="../src/mirall/folderwizard.cpp" line="211"/> + <source>The folder is not available on your %1.<br/>Click to create it.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/folderwizard.cpp" line="237"/> + <source>Folder was successfully created on %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/folderwizard.cpp" line="240"/> + <source>Failed to create the folder on %1.<br/>Please check manually.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/folderwizard.cpp" line="260"/> <source>Better do not use the remote root directory.<br/>If you do, you can <b>not</b> mirror another local folder.</source> <translation>Better do not use the remote root directory.<br/>If you do, you can <b>not</b> mirror another local folder.</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="314"/> + <location filename="../src/mirall/folderwizard.cpp" line="315"/> + <source>to your <a href="%1">%2</a> (version %3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/folderwizard.cpp" line="328"/> + <source>%1 could not be reached:<br/><tt>%2</tt></source> + <translation type="unfinished"></translation> + </message> + <message> <source>to your <a href="%1">ownCloud</a> (version %2)</source> - <translation>to your <a href="%1">ownCloud</a> (version %2)</translation> + <translation type="obsolete">to your <a href="%1">ownCloud</a> (version %2)</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="324"/> + <location filename="../src/mirall/folderwizard.cpp" line="326"/> <source>no configured ownCloud found!</source> <translation>no configured ownCloud found!</translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="325"/> <source>Your ownCloud could not be reached:<br/><tt>%1</tt></source> - <translation>Your ownCloud could not be reached:<br/><tt>%1</tt></translation> + <translation type="obsolete">Your ownCloud could not be reached:<br/><tt>%1</tt></translation> </message> <message> - <location filename="../src/mirall/folderwizard.cpp" line="392"/> + <location filename="../src/mirall/folderwizard.cpp" line="396"/> <source>Select the target folder</source> <translation>Select the target folder</translation> </message> @@ -845,85 +897,97 @@ Please write a bug report.</translation> <translation>%1 Connection Wizard</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="129"/> <source>Trying to connect to ownCloud at %1...</source> - <translation>Trying to connect to ownCloud at %1...</translation> + <translation type="obsolete">Trying to connect to ownCloud at %1...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="161"/> <source><font color="green">Successfully connected to %1: ownCloud version %2 (%3)</font><br/><br/></source> - <translation><font color="green">Successfully connected to %1: ownCloud version %2 (%3)</font><br/><br/></translation> + <translation type="obsolete"><font color="green">Successfully connected to %1: ownCloud version %2 (%3)</font><br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="172"/> <source><font color="red">Failed to connect to ownCloud!</font></source> - <translation><font color="red">Failed to connect to ownCloud!</font></translation> + <translation type="obsolete"><font color="red">Failed to connect to ownCloud!</font></translation> + </message> + <message> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="129"/> + <source>Trying to connect to %1 at %2...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="162"/> + <source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="174"/> + <source><font color="red">Failed to connect to %1!</font></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="176"/> <source>Error: <tt>%1</tt></source> <translation>Error: <tt>%1</tt></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="258"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="261"/> <source>Starting script owncloud-admin...</source> <translation>Starting script owncloud-admin...</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="309"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="312"/> <source><font color="red">Installation of ownCloud failed!</font></source> <translation><font color="red">Installation of ownCloud failed!</font></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/> <source><font color="green">Installation of ownCloud succeeded!</font></source> <translation><font color="green">Installation of ownCloud succeeded!</font></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="350"/> <source>The owncloud admin script can not be found. Setup can not be done.</source> <translation>The owncloud admin script can not be found. Setup can not be done.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="388"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="391"/> <source>Creation of remote folder %1 could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/> <source>Remote folder %1 created successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="414"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="417"/> <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="416"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="419"/> <source>The folder creation resulted in HTTP error code %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="437"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/> <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="442"/> - <source>Congratulations, your ownCloud can be connected!</source> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="445"/> + <source>Succesfully connected to %1!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="444"/> - <source>Press Finish to permanently accept this connection.</source> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="451"/> + <source>Connection to %1 could not be established. Please check again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="447"/> - <source>An ownCloud connection could not be established. Please check again.</source> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="448"/> + <source>Press Finish to permanently accept this connection.</source> <translation type="unfinished"></translation> </message> <message> @@ -935,12 +999,12 @@ Setup can not be done.</translation> <translation type="obsolete">Checking local sync folder %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="367"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/> <source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source> <translation>Local sync folder %1 already exists, setting it up for sync.<br/><br/></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="372"/> <source>Creating local sync folder %1... </source> <translation>Creating local sync folder %1... </translation> </message> @@ -949,12 +1013,12 @@ Setup can not be done.</translation> <translation type="obsolete">Creating local sync folder %1</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="372"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="375"/> <source>ok</source> <translation>ok</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="374"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="377"/> <source>failed.</source> <translation>failed.</translation> </message> @@ -976,12 +1040,12 @@ Setup can not be done.</translation> <translation type="obsolete">The remote folder %1 already exists. Automatic sync setup is skipped for security reasons. Please configure your sync folder manually.</translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="418"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/> <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">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></translation> </message> <message> - <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/> + <location filename="../src/mirall/owncloudsetupwizard.cpp" line="427"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote folder %1 creation failed with error <tt>%2</tt>.</translation> </message> @@ -1085,33 +1149,49 @@ Setup can not be done.</translation> </message> <message> <location filename="../src/mirall/statusdialog.cpp" line="421"/> - <source>Checking ownCloud connection...</source> - <translation>Checking ownCloud connection...</translation> + <source>Checking %1 connection...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/statusdialog.cpp" line="426"/> - <source>No ownCloud connection configured.</source> - <translation>No ownCloud connection configured.</translation> + <source>No %1 connection configured.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../src/mirall/statusdialog.cpp" line="448"/> + <source>Connected to <a href="%1">%2</a>, %3 %4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/mirall/statusdialog.cpp" line="466"/> + <source><p>Failed to connect to %1: <tt>%2</tt></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Checking ownCloud connection...</source> + <translation type="obsolete">Checking ownCloud connection...</translation> + </message> + <message> + <source>No ownCloud connection configured.</source> + <translation type="obsolete">No ownCloud connection configured.</translation> + </message> + <message> <source>Connected to <a href="%1">%2</a>, ownCloud %3</source> - <translation>Connected to <a href="%1">%2</a>, ownCloud %3</translation> + <translation type="obsolete">Connected to <a href="%1">%2</a>, ownCloud %3</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="449"/> + <location filename="../src/mirall/statusdialog.cpp" line="450"/> <source>Version: %1</source> <translation>Version: %1</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="462"/> + <location filename="../src/mirall/statusdialog.cpp" line="463"/> <source>unknown problem.</source> <translation>unknown problem.</translation> </message> <message> - <location filename="../src/mirall/statusdialog.cpp" line="465"/> <source><p>Failed to connect to ownCloud: <tt>%1</tt></p></source> - <translation><p>Failed to connect to ownCloud: <tt>%1</tt></p></translation> + <translation type="obsolete"><p>Failed to connect to ownCloud: <tt>%1</tt></p></translation> </message> </context> <context> @@ -1150,8 +1230,12 @@ Setup can not be done.</translation> </message> <message> <location filename="../src/mirall/updatedetector.cpp" line="117"/> + <source><p>A new version of the %1 client is available.</source> + <translation type="unfinished"></translation> + </message> + <message> <source><p>A new version of the ownCloud Client is available.</source> - <translation><p>A new version of the ownCloud Client is available.</translation> + <translation type="obsolete"><p>A new version of the ownCloud Client is available.</translation> </message> <message> <location filename="../src/mirall/updatedetector.cpp" line="118"/> @@ -1170,12 +1254,12 @@ Setup can not be done.</translation> <context> <name>MirallConfigFile</name> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="330"/> + <location filename="../src/mirall/mirallconfigfile.cpp" line="328"/> <source>ownCloud Password Required</source> <translation type="unfinished">ownCloud Password Required</translation> </message> <message> - <location filename="../src/mirall/mirallconfigfile.cpp" line="331"/> + <location filename="../src/mirall/mirallconfigfile.cpp" line="329"/> <source>Please enter your ownCloud password:</source> <translation type="unfinished">Please enter your ownCloud password:</translation> </message> @@ -1509,33 +1593,33 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">Please enter your ownCloud password:</translation> </message> <message> - <location filename="../src/mirall/theme.cpp" line="34"/> - <location filename="../src/mirall/theme.cpp" line="52"/> + <location filename="../src/mirall/theme.cpp" line="42"/> + <location filename="../src/mirall/theme.cpp" line="60"/> <source>Status undefined</source> <translation type="unfinished">Status undefined</translation> </message> <message> - <location filename="../src/mirall/theme.cpp" line="37"/> + <location filename="../src/mirall/theme.cpp" line="45"/> <source>Waiting to start sync</source> <translation type="unfinished">Waiting to start sync</translation> </message> <message> - <location filename="../src/mirall/theme.cpp" line="40"/> + <location filename="../src/mirall/theme.cpp" line="48"/> <source>Sync is running</source> <translation type="unfinished">Sync is running</translation> </message> <message> - <location filename="../src/mirall/theme.cpp" line="43"/> + <location filename="../src/mirall/theme.cpp" line="51"/> <source>Sync Success</source> <translation type="unfinished">Sync Success</translation> </message> <message> - <location filename="../src/mirall/theme.cpp" line="46"/> + <location filename="../src/mirall/theme.cpp" line="54"/> <source>Sync Error - Click info button for details.</source> <translation type="unfinished">Sync Error - Click info button for details.</translation> </message> <message> - <location filename="../src/mirall/theme.cpp" line="49"/> + <location filename="../src/mirall/theme.cpp" line="57"/> <source>Setup Error</source> <translation type="unfinished">Setup Error</translation> </message> |