[Pkg-owncloud-commits] [owncloud-client] 217/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 2de83b95e30d5b577c8f97d02a06bea6d34fb85c
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Wed Mar 26 01:26:42 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 143 ++++++++++--------
translations/mirall_cs.ts | 143 ++++++++++--------
translations/mirall_de.ts | 143 ++++++++++--------
translations/mirall_el.ts | 143 ++++++++++--------
translations/mirall_en.ts | 141 +++++++++--------
translations/mirall_es.ts | 143 ++++++++++--------
translations/mirall_es_AR.ts | 143 ++++++++++--------
translations/mirall_et.ts | 143 ++++++++++--------
translations/mirall_eu.ts | 143 ++++++++++--------
translations/mirall_fa.ts | 141 +++++++++--------
translations/mirall_fi.ts | 143 ++++++++++--------
translations/mirall_fr.ts | 143 ++++++++++--------
translations/mirall_gl.ts | 143 ++++++++++--------
translations/mirall_hu.ts | 141 +++++++++--------
translations/mirall_it.ts | 143 ++++++++++--------
translations/mirall_ja.ts | 143 ++++++++++--------
translations/mirall_nl.ts | 143 ++++++++++--------
translations/mirall_pl.ts | 143 ++++++++++--------
translations/mirall_pt.ts | 352 +++++++++++++++++++++++--------------------
translations/mirall_pt_BR.ts | 143 ++++++++++--------
translations/mirall_ru.ts | 143 ++++++++++--------
translations/mirall_sk.ts | 143 ++++++++++--------
translations/mirall_sl.ts | 143 ++++++++++--------
translations/mirall_sv.ts | 143 ++++++++++--------
translations/mirall_th.ts | 141 +++++++++--------
translations/mirall_uk.ts | 141 +++++++++--------
translations/mirall_zh_CN.ts | 141 +++++++++--------
translations/mirall_zh_TW.ts | 141 +++++++++--------
translations/pofiles/tr.po | 143 ++++++++++--------
29 files changed, 2505 insertions(+), 1837 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index f95db1d..59dde2e 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirma l'eliminació de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connectat a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -1395,37 +1395,37 @@ It is not advisable to use it.</source>
<translation>Mida</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Reintenta la sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia la llista d'activitats al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>S'ha copiat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>L'estat de sincronització s'ha copiat al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1465,6 +1465,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1877,117 +1905,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Acrediteu-vos</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>No hi ha fitxers de sincronització configurats</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Cap.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Canvis recents</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Obre la carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Fitxers gestionats:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Obre carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calculant la quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Estat desconegut</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Arranjament...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detalls...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Surt %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Acredita...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>No hi ha elements sincronitzats recentment</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
@@ -2094,7 +2122,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
@@ -2154,20 +2182,15 @@ It is not advisable to use it.</source>
<translation>&Adreça del servidor</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Etiqueta d'error</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Escriviu la URL del servidor al que us voleu connectar (sense http o https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2237,7 +2260,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Si encara no teniu un servidor ownCloud, mireu <a href="https://owncloud.com">owncloud.com</a> per més informació.</translation>
@@ -2247,11 +2270,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Construit de la revisió Git <a href="%1">%2</a> a %3, %4 usant OCsync %5 i Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versió %2. Per més informació visiteu <a href="%3">%4</a></p><p><small>Per Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basat en Mirall per Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index e55e09d..a1d9b25 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pozastavit</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Obnovit</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdit odstranění složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 ze %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 místa na disku použito.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Připojeno k <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště</translation>
</message>
@@ -1397,37 +1397,37 @@ Nedoporučuje se jí používat.</translation>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Znovu synchronizovat</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopírovat záznam aktivity do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Zkopírováno do schránky</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Stav synchronizace byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Nyní nejsou v seznamu ignorovaných žádné soubory kvůli předchozím chybám.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 souborů je na seznamu ignorovaných kvůli předchozím chybovým stavům.
@@ -1469,6 +1469,34 @@ Zkuste provést novou synchronizaci.
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1883,117 +1911,117 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Přihlašte se prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Složka %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nejsou nastaveny žádné synchronizované složky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nic.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Otevřít složku %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Spravované složky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Otevřít složku '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Počítám kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Neznámý stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Nastavení...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Přihlásit...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Odhlásit</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Kvóta nedostupná</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 v používání</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Žádné položky nebyly nedávno synchronizovány</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronizace %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
@@ -2100,7 +2128,7 @@ Zkuste provést novou synchronizaci.
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Textový popisek</translation>
</message>
@@ -2160,20 +2188,15 @@ Zkuste provést novou synchronizaci.
<translation>&Adresa serveru</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Popis chyby</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Zadejte URL adresu serveru, ke kterému se chcete připojit (bez http či https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2243,7 +2266,7 @@ Zkuste provést novou synchronizaci.
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Pokud zatím nemáte ownCloud server, získáte více informací na <a href="https://owncloud.com">owncloud.com</a></translation>
@@ -2253,11 +2276,11 @@ Zkuste provést novou synchronizaci.
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Sestaveno z Gitu revize <a href="%1">%2</a> na %3, %4 s použitím OCsync %5 a Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Verze %2. Pro více informací navštivte <a href="%3">%4</a></p><p><small>Vytvořili Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Založeno na Mirall od Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 635aea9..788e091 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Anhalten</translation>
</message>
@@ -119,90 +119,90 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Löschen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Klient neu aufbauen?</p><p><b>Anmerkung:</b>
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbunden mit <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbunden mit <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -1398,37 +1398,37 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Synchronisation wiederholen</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Der Synchronisationsstatus wurde in die Zwischenablage kopiert.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Aktuell werden keine Dateien, aufgrund vorheriger Fehler, ignoriert.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 Datei(en) werden aufgrund vorheriger Fehler ignoriert.
@@ -1469,6 +1469,34 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1883,117 +1911,117 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Keine Sync-Ordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Keine.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ordner %1 öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Verwaltete Ordner:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ordner '%1' öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Berechne Quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Unbekannter Status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Details...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Anmeldung...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Abmeldung</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Quote unbekannt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% von %2 benutzt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronisiere %1 von %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
@@ -2100,7 +2128,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Textbeschriftung</translation>
</message>
@@ -2160,20 +2188,15 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>&Serveradresse</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Error Label</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Bitte tragen Sie die Adresse Ihres Servers ein, zu dem Sie sich verbinden möchten (mit oder ohne http oder https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2243,7 +2266,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Wenn Sie noch keinen ownCloud-Server haben, informieren Sie sich unter <a href="https://owncloud.com">owncloud.com</a>.</translation>
@@ -2253,11 +2276,11 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Erstellt aus Git revision <a href="%1">%2</a> vom %3, %4 mit OCsync %5 und Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Version %2. Für mehr Informationen besuchen Sie <a href="%3">%4</a></p><p><small> Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc., <br> Basierend auf Mirall von Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 931bec0..931e721 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Παύση</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Συνέχεια</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Επιβεβαίωση αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του πελάτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 από %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Ο Συγχρονισμός Εκτελείται</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -1397,37 +1397,37 @@ It is not advisable to use it.</source>
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Επαναλήψη Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Αντιγραφθηκε στο clipboard</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Η κατάσταση συγχρονισμού αντιγράφηκε στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Προς το παρόν κανένα αρχείο δεν θα αγνοηθεί λόγω προηγούμενων σφαλμάτων.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 αρχεία θα ανγοηθούν λόγω προηγούμενων σφαλμάτων.
@@ -1468,6 +1468,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1881,117 +1909,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Παρκαλώ συνδεθείτε</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Κανένας.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Άνοιγμα %1 φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Διαχείριση αρχείων:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Άνοιγμα καταλόγου '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Υπολογισμός μεριδίου χώρου αποθήκευσης...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Άγνωστη κατάσταση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Ρυθμίσεις...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Λεπτομέρειες...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Βοήθεια</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Μερίδιο χώρου αποθήκευσης δεν είναι διαθέσιμο</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
@@ -2098,7 +2126,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
@@ -2158,20 +2186,15 @@ It is not advisable to use it.</source>
<translation>Διακομιστής και Διεύθυνση </translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://..</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Εσφαλμένη Ετικέτα</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Εισάγετε τη URL του διακομιστή με τον οποίο επιθυμείτε να συνδεθείτε (χωρίς http ή https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2241,7 +2264,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Εάν δεν έχετε ένα διακομιστή ownCloud, δείτε στην διεύθυνση <a href="https://owncloud.com">owncloud.com</a> για περισσότερες πληροφορίες.</translation>
@@ -2251,11 +2274,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Δημιουργήθηκε από τη διασκευή Git<a href="%1">%2</a> στο %3, %4 χρησμιποιώντας OCsync %5 και Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 85f3f9a..4a79e38 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -91,7 +91,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
@@ -121,89 +121,89 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -1392,37 +1392,37 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"></translation>
@@ -1462,6 +1462,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1874,117 +1902,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
@@ -2091,7 +2119,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
@@ -2151,20 +2179,15 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2234,7 +2257,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>
@@ -2244,11 +2267,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 2373127..be51103 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar la eliminación de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Note:</b> Esto no eliminará los archivos de su cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 espacio usado en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<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="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>No se ha configurado la cuenta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -1397,37 +1397,37 @@ No se recomienda usarlo.</translation>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Reintentar Sincronizar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copie la lista de actividades al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>El informe de sincronización fue copiado al portapapeles.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actualmente no hay ficheros ignorados por errores previos.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>1% de los archivos fueron ignorados debido a errores previos.
@@ -1468,6 +1468,34 @@ Intente sincronizar los archivos nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Por favor Registrese</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>No hay carpetas de sincronización configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Carpetas administradas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Registrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>No se han sincronizado elementos recientemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizando %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -2099,7 +2127,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Etiqueta</translation>
</message>
@@ -2159,20 +2187,15 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>&Dirección del servidor</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Etiquetado de Error</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Introduzca la dirección URL del servidor al cual se desea conectar (sin http o https)</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Si aún no tiene un servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para obtener más información.</translation>
@@ -2252,11 +2275,11 @@ Intente sincronizar los archivos nuevamente.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Construido de la revisión revision <a href="%1">%2</a> del Git el %3, %4 usando OCsync %5 y Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versión %2. Para más información visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basado en Mirall por Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index d10aec8..018bf6c 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirmá la eliminación del directorio</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p>< [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<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="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -1395,37 +1395,37 @@ It is not advisable to use it.</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Volver a intentar el Sync</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar la lista de actividades al portapapeles.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>El estado de sincronización ha sido copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actualmente ningún archivo es ignorado por errores previos.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 archivos fueron ignorados por errores previos.
@@ -1466,6 +1466,34 @@ Intente sincronizar estos nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1878,117 +1906,117 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Por favor, inicie sesión</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Directorio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Los directorios de sincronización no están configurados.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir directorio %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Directorios administrados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Cancelar %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Iniciando sesión...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>No se sincronizaron elementos recientemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
@@ -2095,7 +2123,7 @@ Intente sincronizar estos nuevamente.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
@@ -2155,21 +2183,16 @@ Intente sincronizar estos nuevamente.</translation>
<translation>&Dirección del servidor:</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...
</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Etiqueta de Error</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Ingresar la URL del servidor que deseas conectarte (sin http o https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2239,7 +2262,7 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Si todavía no tenés un servidor ownCloud, visitá <a href="https://owncloud.com">owncloud.com</a> para obtener más información.</translation>
@@ -2249,11 +2272,11 @@ Intente sincronizar estos nuevamente.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Construido a partir de la revisión <a href="%1">%2</a> de Git el %3, %4 usando OCsync %5 y Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versión %2. Para más información visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basado en Mirall por Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 9bf75c3..24e8ce3 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Taasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Kinnita kausta eemaldamist</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ühendatud <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ühendatud <a href="%1">%2</a> kui <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -1397,37 +1397,37 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Suurus</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Proovi uuesti sünkroniseerida</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopeeri</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Kopeeritud lõikepuhvrisse</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Sünkroniseeringu staatus on kopeeritud lõikepuhvrisse.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Hetkel ei ignoreerita ühtegi faili eelnenud vigade tõttu.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 faili on ignoreeritud eelnenud vigade tõttu.
@@ -1468,6 +1468,34 @@ Proovi neid uuesti sünkroniseerida.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Palun logi sisse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Kaust %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Pole.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Hiljutised muudatused</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ava kaust %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Hallatavad kaustad:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ava kaust '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Mahupiiri arvutamine...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Tundmatu staatus</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Seaded...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Üksikasjad...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Abiinfo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Lõpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Logi sisse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Logi välja</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Mahupiir n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>Kasutusel %1% / %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
@@ -2099,7 +2127,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
@@ -2159,20 +2187,15 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Serveri &Aadress</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Vea silt</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Sisesta serveri URL, millega sa soovid ühenduda (ilma eesliiteta http või https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Kui sul poole veel oma ownCloud serverit, vaata <a href="https://owncloud.com">owncloud.com</a> rohkema info saamiseks.</translation>
@@ -2252,11 +2275,11 @@ Proovi neid uuesti sünkroniseerida.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Loodud Git versioonist <a href="%1">%2</a> %3, %4<br>kasutades OCsync %5 ja Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versioon %2. Täpsemaks infoks külasta <a href="%3">%4</a></p><p><small>Loodud Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc. poolt<br>Põhineb Mirall loodud Duncan Mac-Vicar P. poolt</small></p>%7</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 9d185d9..570ba8b 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausarazi</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Berrekin</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Baieztatu karpetaren ezabatzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Baieztatu Karpetaren Leheneratzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a>ra konektatuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -1392,37 +1392,37 @@ It is not advisable to use it.</source>
<translation>Tamaina</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Saiatu berriz sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Arbelera kopiatua</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Sinkronizazio egoera arbelera kopiatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Oraintxe ez da fitxategirik baztertzen aurreko erroreak direla eta.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 fitxategi baztertu dira aurreko erroreak direla eta.
@@ -1463,6 +1463,34 @@ Saiatu horiek berriz sinkronizatzen.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1875,117 +1903,117 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Mesedez saioa hasi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Bat ere ez.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Azkenengo Aldaketak</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ireki %1 karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Kudeatutako karpetak:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ireki '%1' karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Egoera ezezaguna</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Ezarpenak...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Xehetasunak...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Laguntza</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>%1etik Irten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Saioa hasi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Saioa bukatu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%2tik %%1 erabilita</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Ez da azken aldian ezer sinkronizatu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
@@ -2092,7 +2120,7 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
@@ -2152,20 +2180,15 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation>Zerbitzari &Helbidea</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Sartu konektatu nahi duzun zerbitzariaren URLa (http edo https gabe).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2235,7 +2258,7 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>ownCloud zerbitzaririk ez baduzu, ikusi <a href="https://owncloud.com">owncloud.com</a> informazio gehiago eskuratzeko. </translation>
@@ -2245,11 +2268,11 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small><a href="%1">%2</a> Git errebisiotitik eraikita, %3an, %4etan OCsync %5 eta Qt %6 erabiliz.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>%2 Bertsioa, informazio gehiago eskuratzeko ikusi <a href="%3">%4</a></p><p><small>Egileak: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br> Duncan Mac-Vicar P.-ek egindako Mirall programan oinarrituta</small></p>%7</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index f0a475e..9321562 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>توقف کردن</translation>
</message>
@@ -119,89 +119,89 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>قبول کردن پاک شدن پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1390,37 +1390,37 @@ It is not advisable to use it.</source>
<translation>اندازه</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>کپی به کلیپ بورد</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1460,6 +1460,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1872,117 +1900,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>بازکردن %1 پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>پوشه های مدیریت شده:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>راهنما</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
@@ -2089,7 +2117,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
@@ -2149,20 +2177,15 @@ It is not advisable to use it.</source>
<translation>سرور& آدرس</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>برچسب خطا</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2232,7 +2255,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>اگر شما هنوز یک سرور ownCloud ندارید، <a href="https://owncloud.com">owncloud.com</a> را برای اطلاعات بیشتر ببینید. </translation>
@@ -2242,11 +2265,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index e14706e..0148874 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Keskeytä</translation>
</message>
@@ -119,89 +119,89 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Vahvista kansion poisto</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1391,37 +1391,37 @@ It is not advisable to use it.</source>
<translation>Koko</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Yritä uudelleen synkronointia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Kopioitu leikepöydälle</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Synkronointitila on kopioitu leikepöydälle.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1461,6 +1461,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1874,117 +1902,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Kansio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritetty.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Viimeisimmät muutokset</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Avaa %1-kansio</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Hallitut kansiot:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Avaa kansio '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Lasketaan kiintiötä...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Tuntematon tila</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Tiedot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Ohje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Lopeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Kirjaudu sisään...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Kirjaudu ulos</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1%/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Kohteita ei ole synkronoitu äskettäin</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synkronoidaan %1/%2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
@@ -2091,7 +2119,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
@@ -2151,20 +2179,15 @@ It is not advisable to use it.</source>
<translation>Palvelimen &osoite</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2234,7 +2257,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Jos käytössäsi ei ole vielä ownCloud-palvelinta, lue lisätietoja osoitteessa <a href="https://owncloud.com">owncloud.com</a>.</translation>
@@ -2244,11 +2267,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Koonti Git-revisiosta <a href="%1">%2</a> %3, %4 käyttää OCsyncin versiota %5 ja Qt:n versiota %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versio %2. Lisätietoja osoitteessa <a href="%3">%4</a></p><p><small>Tehnyt Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Pohjautuu Duncan Mac-Vicar P:n Miralliin</small></p>%7</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 33a6b68..d6b7c32 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Mettre en pause</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirmer le retrait du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Confirmation de la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connecté à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, fichier %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connecté à <a href="%1">%2</a> en tant que <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -1397,37 +1397,37 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Lancer à nouveau la synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copier la liste d'activités dans le presse papiers.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copié dans le presse-papiers</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Le statu de synchronisation a été copié dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actuellement aucun fichier n'a été ignoré en raison d'erreurs précédentes.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 fichiers ont été ignorés en raison des erreurs précédentes.
@@ -1468,6 +1468,34 @@ Il est déconseillé de l'utiliser.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Aucun répertoire synchronisé n'est configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Aucun.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ouvrir le répertoire %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Répertoires suivis :</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ouvrir le dossier '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calcul du quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Statut inconnu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Paramètres...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Détails...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Se connecter...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 occupés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Aucun item synchronisé récemment</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronisation en cours : %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
@@ -2099,7 +2127,7 @@ Il est déconseillé de l'utiliser.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Zone de texte</translation>
</message>
@@ -2159,20 +2187,15 @@ Il est déconseillé de l'utiliser.</translation>
<translation>&Adresse du serveur</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Message d'erreur</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Saisissez l'URL du serveur auquel vous souhaitez vous connecter (sans http ni https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Si vous n'avez pas encore de serveur ownCloud, consultez <a href="https://owncloud.com">owncloud.com</a> pour obtenir plus d'informations.</translation>
@@ -2252,11 +2275,11 @@ Il est déconseillé de l'utiliser.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Construit à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant OCsync %5 et Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Version %2. Pour plus d'informations, consultez <a href="%3">%4</a></p><p><small>Par Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Basé sur Mirall par Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 78cf655..653ace7 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar a eliminación do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation> Espazo usado do servidor %1 (%3%) de %2.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
@@ -1397,37 +1397,37 @@ Recomendámoslle que non o use.</translation>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Volver tentar a sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copiado no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>O estado de sincronización foi copiado no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actualmente non hai ficheiros ignorados por mor de erros anteriores.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 ficheiros foron ignorados por mor de erros anteriores.
@@ -1468,6 +1468,34 @@ Tente sincronizalos de novo.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Non se configuraron cartafoles de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir o cartafol %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Cartafoles xestionados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calculando a cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Estado descoñecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Axustes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Axuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Rexistrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Cota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>Usado %1% de %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Non hai elementos sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizando %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -2099,7 +2127,7 @@ Tente sincronizalos de novo.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
@@ -2159,20 +2187,15 @@ Tente sincronizalos de novo.</translation>
<translation>&Enderezo do servidor</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Etiqueta de erro</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Introduza o URL do servidor se quere conectarte a (sen o http ou https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ Tente sincronizalos de novo.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Se aínda non ten un servidor ownCloud, vexa <a href="https://owncloud.com">owncloud.com</a> para obter máis información.</translation>
@@ -2252,11 +2275,11 @@ Tente sincronizalos de novo.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Construído desde a revisión <a href="%1">%2</a> no Git o %3, %4 empregando OCsync %5 e Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versión %2.Versión <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baseado no Mirall por Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 7eba202..3050e35 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Szünet</translation>
</message>
@@ -119,89 +119,89 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Folytatás</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1390,37 +1390,37 @@ It is not advisable to use it.</source>
<translation>Méret</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Másolás</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Bemásolva a vágólapra</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1460,6 +1460,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1872,117 +1900,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Belépés szükséges</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Mappa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nincsenek megadva szinkronizálandó mappák.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nincs</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Legutóbbi változások</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>%1 mappa megnyitása</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Kezelt mappák:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Kvóta kiszámítása...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Ismeretlen állapot</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Beállítások...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Részletek...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Súgó</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Belépés...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Frissítve</translation>
</message>
@@ -2089,7 +2117,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
@@ -2149,20 +2177,15 @@ It is not advisable to use it.</source>
<translation>Kiszolgáló &címe</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2232,7 +2255,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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"/>
@@ -2242,11 +2265,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 236a0f7..a211c2b 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Riprendi</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Conferma la rimozione della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) di %2 spazio in uso sul server.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connesso a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connesso a <a href="%1">%2</a> come <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -1396,37 +1396,37 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Riprova sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia l'elenco delle attività negli appunti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Lo stato di sincronizzazione è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Attualmente nessun file è ignorato a causa di errori precedenti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 file sono ignorati a causa di errori precedenti.
@@ -1467,6 +1467,34 @@ Prova a sincronizzare nuovamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1881,117 +1909,117 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nessuna cartella configurata per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nessuna.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Apri la cartella %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Cartelle gestite:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Apri la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calcolo quota in corso...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Stato sconosciuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Impostazioni...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Dettagli...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Accedi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% di %2 utilizzati</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Nessun elemento sincronizzato di recente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizzazione di %1 di %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
@@ -2098,7 +2126,7 @@ Prova a sincronizzare nuovamente.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
@@ -2158,20 +2186,15 @@ Prova a sincronizzare nuovamente.</translation>
<translation>In&dirizzo server</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Etichetta di errore</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Digita l'URL del server al quale vuoi collegarti (senza http o https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2241,7 +2264,7 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Se non hai ancora un server ownCloud, visita <a href="https://owncloud.com">owncloud.com</a> per ulteriori informazioni.</translation>
@@ -2251,11 +2274,11 @@ Prova a sincronizzare nuovamente.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando OCsync %5 e Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versione %2. Per ulteriori informazioni, visita <a href="%3">%4</a></p><p><small>scritto da Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc..<br>Basato su Mirall di Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 05f27ae..152631e 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>一時停止</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>注:</b> 外部ネットワークストレージ、共有フォルダーを含んだフォルダーの場合は、上限値が異なることがあります。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>フォルダーの削除を確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 使用中のサーバー領域</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> に %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> へ接続しました。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a> に <i>%3</i> として接続</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -1396,37 +1396,37 @@ It is not advisable to use it.</source>
<translation>サイズ</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>同期を再実行</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>クリップボードにコピー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>前にエラーが発生したため、無視するファイルはありません</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>以前のエラーが発生したため、%1 のファイルが無視されていました。
@@ -1467,6 +1467,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1881,117 +1909,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>同期フォルダーが設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>なし</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>%1 フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>管理フォルダー:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>クォータを計算中...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>サインイン...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>クォータ n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%2 のうち %1% を使用中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
@@ -2098,7 +2126,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
@@ -2158,20 +2186,15 @@ It is not advisable to use it.</source>
<translation>サーバーアドレス(&A)</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>エラーラベル</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>接続したいサーバーのURLを（httpもしくはhttpsを含めず）入力してください</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2241,7 +2264,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>ownCloudサーバーをまだ持っていない場合は、<a href="https://owncloud.com">owncloud.com</a>で詳細な情報を参照してください。</translation>
@@ -2251,11 +2274,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>%3, %4 のGitリビジョン<a href="%1">%2</a>からのビルド OCsync %5 と Qt %6 を利用</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Version %2. 詳細な情報は、<a href="%3">%4</a>を参照してください。</p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 91d30a9..f6a4763 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Hervatten</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Bevestig het verwijderen van de map</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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 map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) van %2 serverruimte in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbonden met <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
@@ -1397,37 +1397,37 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Synchroniseer opnieuw</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Gekopieerd naar het klembord</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Het synchronisatie overzicht is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Er zijn nu geen bestanden genegeerd vanwege eerdere fouten.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 bestanden zijn genegeerd vanwege eerdere fouten.
@@ -1468,6 +1468,34 @@ Probeer opnieuw te synchroniseren.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Geen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Open %1 map</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Beheerde mappen:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Open map '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Quota worden berekend ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Onbekende status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Instellingen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Details ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Inloggen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Uitloggen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Quota niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% van %2 gebruikt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Recent niets gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchroniseren %1 van %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
@@ -2099,7 +2127,7 @@ Probeer opnieuw te synchroniseren.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Tekstlabel</translation>
</message>
@@ -2159,20 +2187,15 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Server&adres</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Fout label</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Voer de URL in van de server waarmee u wilt verbinden (zonder http of https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Bezoek <a href="https://owncloud.com">owncloud.com</a> als u nog geen ownCloud-server heeft.</translation>
@@ -2252,11 +2275,11 @@ Probeer opnieuw te synchroniseren.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Gecompileerd van Git revisie <a href="%1">%2</a> op %3, %4 m.b.v. OCsync %5 en Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versie %2. Bezoek voor meer informatie <a href="%3">%4</a></p><p><small>Geschreven door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Gebaseerd op Mirall van Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 4f146a7..a0c501b 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Wstrzymaj</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Wznów</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Potwierdź usunięcie katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Podłączony do <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, plik %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Podłączony do <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -1397,37 +1397,37 @@ Niezalecane jest jego użycie.</translation>
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Ponów synchronizację</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiuj listę aktywności do schowka.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Skopiuj do schowka</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Status synchronizacji został skopiowany do schowka.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Obecnie nie ma plików, które są ignorowane z powodu wcześniejszych błędów.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 pliki są ignorowane z powodu błędów.
@@ -1468,6 +1468,34 @@ Niezalecane jest jego użycie.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Proszę się zalogować</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nie skonfigurowano synchronizowanych folderów.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Brak.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Otwórz folder %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Zarządzane foldery:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Otwórz katalog '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Obliczam quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Nieznany status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Ustawienia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Szczegóły...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Loguję...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Brak ostatnich synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronizacja %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
@@ -2099,7 +2127,7 @@ Niezalecane jest jego użycie.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Etykieta tekstowa</translation>
</message>
@@ -2159,20 +2187,15 @@ Niezalecane jest jego użycie.</translation>
<translation>Adres &serwera</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Etykieta błędu</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Wpisz adres URL serwera z którym chcesz się połączyć (bez http lub https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2243,7 +2266,7 @@ Kliknij</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Jeśli nie masz jeszcze serwera ownCloud, wejdź na <a href="https://owncloud.com">owncloud.com</a> aby dowiedzieć się jak go zainstalować.</translation>
@@ -2253,11 +2276,11 @@ Kliknij</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Zbudowany z wersji Git <a href="%1">%2</a> on %3, %4 używając OCsync %5 oraz Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Wersja %2. Aby uzyskać więcej informacji odwiedź <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Oparty na Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index fcaeae3..1eedd00 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -9,7 +9,7 @@
<message>
<location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/>
<source>Pick a local folder on your computer to sync</source>
- <translation type="unfinished"/>
+ <translation>Escollha a pasta local a sincronizar</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/>
@@ -80,7 +80,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="20"/>
<source>Account to Synchronize</source>
- <translation type="unfinished"/>
+ <translation>Conta a sincronizar</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="41"/>
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -106,7 +106,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="94"/>
<source>Storage Usage</source>
- <translation type="unfinished"/>
+ <translation>Utilização do armazenamento</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="116"/>
@@ -116,94 +116,94 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="123"/>
<source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation type="unfinished"/>
+ <translation><b>Nota:</b> Algumas pastas, incluindo pastas partilhadas ou montadas na rede, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirme a remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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><p>Quer mesmo parar a sincronização da pasta <i>%1</i>?</p><b>Nota:</b> Isto não irá remover os ficheiros no seu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
- <translation type="unfinished"/>
+ <translation>Confirmar reposição da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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><p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>A sincronização está a decorrer</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
- <translation type="unfinished"/>
+ <translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
+ <translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
- <translation type="unfinished"/>
+ <translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
- <translation type="unfinished"/>
+ <translation>Histórico de utilização de armazenamento não disponível.</translation>
</message>
</context>
<context>
@@ -234,17 +234,17 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
- <translation type="unfinished"/>
+ <translation>Não foi configurada nenhuma conta ownCloud</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
- <translation type="unfinished"/>
+ <translation>O servidor configurado para este cliente é muito antigo</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
- <translation type="unfinished"/>
+ <translation>Por favor actualize para a ultima versão do servidor e reinicie o cliente.</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
@@ -254,7 +254,7 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
- <translation type="unfinished"/>
+ <translation>As credenciais fornecidas não estão correctas</translation>
</message>
</context>
<context>
@@ -262,7 +262,7 @@
<message>
<location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
- <translation type="unfinished"/>
+ <translation>Impossível criar 'csync-context'</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="157"/>
@@ -379,12 +379,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderman.cpp" line="167"/>
<source>Could not reset folder state</source>
- <translation type="unfinished"/>
+ <translation>Não foi possível repor o estado da pasta</translation>
</message>
<message>
<location filename="../src/mirall/folderman.cpp" line="168"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
+ <translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
<location filename="../src/mirall/folderman.cpp" line="744"/>
@@ -399,7 +399,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
- <translation type="unfinished"/>
+ <translation>A preparar para sincronização.</translation>
</message>
<message>
<location filename="../src/mirall/folderman.cpp" line="753"/>
@@ -409,7 +409,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
- <translation type="unfinished"/>
+ <translation>O servidor não está disponível de momento.</translation>
</message>
<message>
<location filename="../src/mirall/folderman.cpp" line="759"/>
@@ -419,7 +419,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
- <translation type="unfinished"/>
+ <translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
<location filename="../src/mirall/folderman.cpp" line="767"/>
@@ -429,7 +429,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
- <translation type="unfinished"/>
+ <translation>Cancelado pelo utilizador.</translation>
</message>
<message>
<location filename="../src/mirall/folderman.cpp" line="773"/>
@@ -439,7 +439,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
- <translation type="unfinished"/>
+ <translation>%1 (Sincronização em pausa)</translation>
</message>
</context>
<context>
@@ -453,7 +453,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderstatusmodel.cpp" line="204"/>
<source>Syncing all files in your account with</source>
- <translation type="unfinished"/>
+ <translation>A sincronizar todos os ficheiros sua conta com</translation>
</message>
<message>
<location filename="../src/mirall/folderstatusmodel.cpp" line="207"/>
@@ -475,12 +475,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="61"/>
<source>Click to select a local folder to sync.</source>
- <translation type="unfinished"/>
+ <translation>Escolha a pasta local a sincronizar.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="65"/>
<source>Enter the path to the local folder.</source>
- <translation type="unfinished"/>
+ <translation>Localização da pasta.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="69"/>
@@ -490,17 +490,17 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="98"/>
<source>No valid local folder selected!</source>
- <translation type="unfinished"/>
+ <translation>Pasta local seleccionada inválida!</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="103"/>
<source>You have no permission to write to the selected folder!</source>
- <translation type="unfinished"/>
+ <translation>Não tem permissões de escrina na pasta seleccionada!</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="127"/>
<source>The local path %1 is already an upload folder. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>A pasta local %1 já é uma pasta de sincronização. por favor escolha outra!</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="132"/>
@@ -510,17 +510,17 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>A pasta seleccionada é um link simbólico. Uma pasta já configurada é 'pai' da atual pasta selecionada.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
<source>An already configured folder contains the currently entered folder.</source>
- <translation type="unfinished"/>
+ <translation>Uma pasta anteriormente configurada está contida nos dados introduzidos.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="152"/>
<source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>A pasta seleccionada é um link simbólico. Uma pasta já configurada está contida na pasta para onde este link está a apontar.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="165"/>
@@ -530,7 +530,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="176"/>
<source>The alias <i>%1</i> is already in use. Please pick another alias.</source>
- <translation type="unfinished"/>
+ <translation>O descritivo <i>%1</i> já está em uso. Por favor escolha outro.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="209"/>
@@ -558,27 +558,27 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="282"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation type="unfinished"/>
+ <translation>Impossível criar a pasta em %1. Por favor valide manualmente.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="331"/>
<source>Choose this to sync the entire account</source>
- <translation type="unfinished"/>
+ <translation>Escolha para sincronizar a sua conta</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="386"/>
<source>This folder is already being synced.</source>
- <translation type="unfinished"/>
+ <translation>Esta pasta já está a ser sincronizada.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="388"/>
<source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source>
- <translation type="unfinished"/>
+ <translation>Já está a sincronizar <i>%1</i>, que é uma pasta 'parente' de <i>%2</i>.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="392"/>
<source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
- <translation type="unfinished"/>
+ <translation>Já está a sincronizar todos os seus ficheiros. Sincronizar outra pasta<b>não</b> é suportado. Se deseja sincronizar múltiplas pastas, por favor altere a configuração da pasta raiz de sincronização.</translation>
</message>
</context>
<context>
@@ -644,7 +644,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/generalsettings.ui" line="91"/>
<source>&Restart && Update</source>
- <translation type="unfinished"/>
+ <translation>&Reiniciar && Atualizar</translation>
</message>
</context>
<context>
@@ -665,7 +665,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/ignorelisteditor.ui" line="14"/>
<source>Ignored Files Editor</source>
- <translation type="unfinished"/>
+ <translation>Editor de ficheiros ignorados</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.ui" line="53"/>
@@ -697,27 +697,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="105"/>
<source>Add Ignore Pattern</source>
- <translation type="unfinished"/>
+ <translation>Adicione regra para ignorar ficheiros</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="106"/>
<source>Add a new ignore pattern:</source>
- <translation type="unfinished"/>
+ <translation>Adicione nova regra para ignorar ficheiros:</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="128"/>
<source>Edit Ignore Pattern</source>
- <translation type="unfinished"/>
+ <translation>Editar regra</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="129"/>
<source>Edit ignore pattern:</source>
- <translation type="unfinished"/>
+ <translation>Editar regra:</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="140"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
- <translation type="unfinished"/>
+ <translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada nesta vista.</translation>
</message>
</context>
<context>
@@ -796,22 +796,22 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation type="unfinished"/>
+ <translation><p>Nova versão do cliente %1 disponível.</p><p>A versão <b>%2</b> está disponível. A versão instalada é: %3</p></translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
- <translation type="unfinished"/>
+ <translation>Ignorar esta versão</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
- <translation type="unfinished"/>
+ <translation>Ignorar por agora</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
- <translation type="unfinished"/>
+ <translation>Obter atualização</translation>
</message>
</context>
<context>
@@ -839,7 +839,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/networksettings.ui" line="52"/>
<source>Specify proxy manually as</source>
- <translation type="unfinished"/>
+ <translation>Especificar proxy manual</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="80"/>
@@ -854,12 +854,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/networksettings.ui" line="134"/>
<source>Proxy server requires authentication</source>
- <translation type="unfinished"/>
+ <translation>Proxy requer autenticação</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
- <translation type="unfinished"/>
+ <translation>Largura de Banda de Download</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="196"/>
@@ -882,7 +882,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
- <translation type="unfinished"/>
+ <translation>Largura de Banda de Upload</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="285"/>
@@ -926,7 +926,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<location filename="../src/updater/ocupdater.cpp" line="56"/>
<source>A new update is about to be installed. The updater may ask
for additional privileges during the process.</source>
- <translation type="unfinished"/>
+ <translation>Uma nova atualização vai ser instalada. Durante a atualização podem ser pedidos privilégios de administrador.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="77"/>
@@ -936,7 +936,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="79"/>
<source>Version %1 available. Restart application to start the update.</source>
- <translation type="unfinished"/>
+ <translation>Versão %1 disponível. Reinicie a aplicação para iniciar atualização.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="81"/>
@@ -951,12 +951,12 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
<source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation type="unfinished"/>
+ <translation>Nova versão %1 disponível. Por favor utilize a ferramenta de actualização para a instalar.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
<source>Checking update server...</source>
- <translation type="unfinished"/>
+ <translation>A verificar atualizações no servidor...</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="91"/>
@@ -974,7 +974,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="49"/>
<source>Setup local folder options</source>
- <translation type="unfinished"/>
+ <translation>Configurar opções das pastas locais</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="58"/>
@@ -984,32 +984,32 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="108"/>
<source>Your entire account will be synced to the local folder '%1'.</source>
- <translation type="unfinished"/>
+ <translation>A sua conta vai ser sincronizada para a pasta local '%1'.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="111"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
- <translation type="unfinished"/>
+ <translation>%1 pasta '%2' sincronizada para pasta '%3'</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="117"/>
<source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source>
- <translation type="unfinished"/>
+ <translation><p><small><strong>Aviso:</strong> Tem várias pastas configuradas. Se prosseguir com as definições actuais, a configuração das pastas será rejeotada e será criada uma pasta raiz de sincronização!</small></p></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
<source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation type="unfinished"/>
+ <translation><p><small><strong>Aviso:</strong> A pasta local não está vazia. Faça a sua escolha!</small></p></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
- <translation type="unfinished"/>
+ <translation>Pasta local de sincronização</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
- <translation type="unfinished"/>
+ <translation>Actualize definições avançadas</translation>
</message>
</context>
<context>
@@ -1027,7 +1027,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudhttpcredspage.cpp" line="159"/>
<source>Update user credentials</source>
- <translation type="unfinished"/>
+ <translation>Actualize credenciais do utilizador</translation>
</message>
</context>
<context>
@@ -1040,13 +1040,13 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="45"/>
<source>Setup %1 server</source>
- <translation type="unfinished"/>
+ <translation>Configurar servidor %1</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="105"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
- <translation type="unfinished"/>
+ <translation>Este endereço não é seguro. A sua utilização não é aconselhada.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="109"/>
@@ -1056,7 +1056,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="223"/>
<source>Could not connect securely. Do you want to connect unencrypted instead (not recommended)?</source>
- <translation type="unfinished"/>
+ <translation>Não foi possível estabelecer uma ligação segura. Deseja utilizar uma ligação não segura?(não recomendado)?</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="224"/>
@@ -1066,7 +1066,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="261"/>
<source>Update %1 server</source>
- <translation type="unfinished"/>
+ <translation>Actualizar servidor %1</translation>
</message>
</context>
<context>
@@ -1074,12 +1074,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Folder rename failed</source>
- <translation type="unfinished"/>
+ <translation>Erro ao renomear a pasta</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="357"/>
<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>Impossível remover e fazer cópia de segurança da pasta, porque a pasta, ou um ficheiro dentro da pasta, está aberta noutro programa. Por favor feche a pasta, ou ficheiro, e tente novamente.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="411"/>
@@ -1131,12 +1131,12 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="172"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="180"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
- <translation type="unfinished"/>
+ <translation>Impossível conectar a %1 em %2:<br/>%3</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="263"/>
<source>No remote folder specified!</source>
- <translation type="unfinished"/>
+ <translation>Não foi indicada a pasta remota!</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="269"/>
@@ -1219,17 +1219,17 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="38"/>
<source>Everything set up!</source>
- <translation type="unfinished"/>
+ <translation>Configuração concluida!</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="77"/>
<source>Your entire account is synced to the local folder <i>%1</i></source>
- <translation type="unfinished"/>
+ <translation>A sua conta foi sincronizada para a pasta local <i>%1</i></translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="80"/>
<source>%1 folder <i>%1</i> is synced to local folder <i>%2</i></source>
- <translation type="unfinished"/>
+ <translation>%1 pasta <i>%1</i> sincronizada para pasta local <i>%2</i></translation>
</message>
</context>
<context>
@@ -1287,12 +1287,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
- <translation type="unfinished"/>
+ <translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
- <translation type="unfinished"/>
+ <translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
@@ -1390,40 +1390,41 @@ It is not advisable to use it.</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Tentar sincronizar novamente</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Copiar lista de actividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>O estado da sincronização foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Devido a erros anteriores, nenhum ficheiro é ignorado.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation type="unfinished"/>
+ <translation>%1 ficheiros ignorados devido a erros anteriore.
+Por favor tente sincronizar novamente.</translation>
</message>
</context>
<context>
@@ -1460,16 +1461,44 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
- <translation type="unfinished"/>
+ <translation>%1 - Autenticação</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
- <translation type="unfinished"/>
+ <translation>%1 - %2</translation>
</message>
</context>
<context>
@@ -1873,117 +1902,117 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
- <translation type="unfinished"/>
+ <translation>Por favor inicie a sessão</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nenhuma pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
- <translation type="unfinished"/>
+ <translation>Nada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Alterações recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir a pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Pastas Geridas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
- <translation type="unfinished"/>
+ <translation>Abrir %1 no browser</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>A calcular quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Estado desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
- <translation type="unfinished"/>
+ <translation>Sair do %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Entrar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
- <translation type="unfinished"/>
+ <translation>Quota não disponível</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
- <translation type="unfinished"/>
+ <translation>%1% de %2 utilizado</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>A sincronizar %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -2010,27 +2039,27 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
- <translation type="unfinished"/>
+ <translation>Seleccione Pasta local</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
- <translation type="unfinished"/>
+ <translation>&Manter dados locais</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Sincroniza dados existentes para um novo local.</small></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="158"/>
<source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p>Se esta caixa estiver seleccionada, o conteúdo existente na pasta local será apagado e será iniciada uma nova sincronização a partir dos dados do servidor.</p><p>Não seleccione esta caixa se os dados locais tiverem de ser sincronizados com o servidor.</p></body></html></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
- <translation type="unfinished"/>
+ <translation>Iniciar uma &sincronização limpa</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
@@ -2063,7 +2092,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/wizard/owncloudhttpcredspage.ui" line="58"/>
<source>Error Label</source>
- <translation type="unfinished"/>
+ <translation>Error Label</translation>
</message>
<message>
<location filename="../src/wizard/owncloudhttpcredspage.ui" line="109"/>
@@ -2090,7 +2119,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
@@ -2150,19 +2179,14 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Endereço do servidor</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
+ <translation>Error Label</translation>
</message>
</context>
<context>
@@ -2180,13 +2204,13 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/wizard/owncloudwizardresultpage.ui" line="69"/>
<source>Your entire account is synced to the local folder </source>
- <translation type="unfinished"/>
+ <translation>A sua conta está sincronizada na pasta local</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.ui" line="103"/>
<location filename="../src/wizard/owncloudwizardresultpage.ui" line="119"/>
<source>PushButton</source>
- <translation type="unfinished"/>
+ <translation>Botão</translation>
</message>
</context>
<context>
@@ -2227,29 +2251,29 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/main.cpp" line="31"/>
<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>%1 necessita de uma Barra de Tarefas. Se está a utilizar XFCE, por favor siga as seguintes <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">instruções</a>. Caso contrário, por favor instale uma Barra de Tarefas, por exemplo 'trayer', e tente novamente.</translation>
</message>
</context>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Se ainda não tem um servidor ownCloud, visite <a href="https://owncloud.com">owncloud.com</a> para mais informações.</translation>
</message>
</context>
<context>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
- <translation type="unfinished"/>
+ <translation><p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>Desenvolvido por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baseado em Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
</context>
<context>
@@ -2330,7 +2354,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation type="unfinished"/>
+ <translation>Sincronizado com suceso, alguns ficheiros foram ignorados.</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
@@ -2360,7 +2384,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/theme.cpp" line="78"/>
<source>Sync is paused</source>
- <translation type="unfinished"/>
+ <translation>Sincronização em pausa</translation>
</message>
</context>
</TS>
\ No newline at end of file
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 74ab32e..f3aeb24 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Confirma remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Sincronização acontecendo</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
@@ -1395,37 +1395,37 @@ It is not advisable to use it.</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Rafazer Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Copiado para área de transferência</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>O estado de sincronização foi copiado para o clipboard.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Correntemente nenhum arquivo será ignorado por causa de erros prévios.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 arquivos são ignorados por causa de erros prévios.
@@ -1466,6 +1466,34 @@ Tente sincronizar novamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1880,117 +1908,117 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Pastas de sincronização não configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nenhum.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Pastas Gerenciadas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Calculando cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Status desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Conectar em...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Cota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 em uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Não há itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizando %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
@@ -2097,7 +2125,7 @@ Tente sincronizar novamente.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
@@ -2157,20 +2185,15 @@ Tente sincronizar novamente.</translation>
<translation>&Endereço do Servidor</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Rótulo de Erro</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Entrar a URL do servidor que você quer se conectar(sem http ou https)</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2240,7 +2263,7 @@ Tente sincronizar novamente.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Se você ainda não tem um servidor ownCloud, acesse <a href="https://owncloud.com">owncloud.com</a> for more info.</translation>
@@ -2250,11 +2273,11 @@ Tente sincronizar novamente.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Construído a partir de revisão Git <a href="%1">%2</a> on %3, %4 usando OCsync %5 e Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>BAseado em Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index aaf5d71..3514672 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Продолжить</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Подтвердите удаление папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Соединились с <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Подключён к <a href="%1">%2</a> как <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -1397,37 +1397,37 @@ It is not advisable to use it.</source>
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Повторить попытку синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопировать журнал синхронизации в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Скопировано в буфер обмена</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Статус синхронизации скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>На данный момент файлы, игнорируемые из-за ошибок, отсутствуют.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 файлов проигнорировано из-за ошибок.
@@ -1468,6 +1468,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Пожалуйста войдите в учётную запись</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Папка %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Нет папок для синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Пусто</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Открыть %1 папку</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Управляемые папки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Открыть папку '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Расчёт квоты...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Неизвестный статус</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Детали...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Выход %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Войти...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Квота недоступна</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>Используется %1% из %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Недавно ничего не синхронизировалсь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
@@ -2099,7 +2127,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
@@ -2159,20 +2187,15 @@ It is not advisable to use it.</source>
<translation>&Адрес сервера</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Название ошибки</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Введите URL сервера к которому вы хотите подключиться (без http:// и https://).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Если у Вас ещё нет сервера ownCloud, обратитесь за дополнительной информацией на <a href="https://owncloud.com">owncloud.com</a></translation>
@@ -2252,11 +2275,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Собрано из исходников Git <a href="%1">%2</a> на %3, %4 используя OCsync %5 и Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Версия %2. Дополнительная информация: <a href="%3">%4</a></p><p><small>Создано Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>За основу взато ПО Mirall. Duncan Mac-Vicar P.</small></p>%7
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 77d34c8..b31b3d8 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Pauza</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Poznámka:<b> Niektoré priečinky, zahŕňajúc sieťové alebo zdieľané, môžu mať odlišné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Obnovenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdiť odstránenie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť resetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Nenastavený žiaden účet.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Pripojené k <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, súbor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Pripojené k <a href="%1">%2</a> ako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
@@ -1396,37 +1396,37 @@ Nie je vhodné ju používať.</translation>
<translation>Veľkosť</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Opakovať synchronizáciu</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopírovať</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Skopírovať zoznam aktivít do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Skopírované do "clipboard"</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Stav synchronizácie bol nakopírovaný do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>V súčastnosti niesú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 súborov je na čiernej listine kvôli predchádzajúcim chybovým stavom.</translation>
@@ -1466,6 +1466,34 @@ Nie je vhodné ju používať.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1878,117 +1906,117 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Prihláste sa prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Priečinok %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nie sú nastavené žiadne synchronizačné priečinky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Žiaden.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Nedávne zmeny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Otvoriť %1 priečinok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Spravované priečinky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Otvoriť priečinok '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Počítanie kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Neznámy stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Nastavenia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detaily...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Ukončiť %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Prihlásiť</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Odhlásiť</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 sa používa</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Žiadne nedávno synchronizované položky</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
@@ -2095,7 +2123,7 @@ Nie je vhodné ju používať.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
@@ -2155,20 +2183,15 @@ Nie je vhodné ju používať.</translation>
<translation>Serverová &Adresa</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Chybová značka</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Zadajte URL adresu servera, ku ktorému sa chcete pripojiť (bez http či https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2238,7 +2261,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Ak ešte nemáte vlastný ownCloud server, na stránke <a href="https://owncloud.com">owncloud.com</a> nájdete viac informácií.</translation>
@@ -2248,11 +2271,11 @@ Nie je vhodné ju používať.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Zostavenie z Git revízie <a href="%1">%2</a> na %3, %4 za použitia OCsync %5 a Qt toolkitu %6.</small></p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Verzia %2. Pre získanie viac informácií navštívte stránku <a href="%3">%4</a></p><p><small>Od Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Založené na Mirall od Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 71a9e99..2fdcafc 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Premor</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Potrdi odstranitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem mape iz odjemalca ne bodo odstranjene.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -1397,37 +1397,37 @@ Uporaba ni priporočljiva.</translation>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Ponovno začni usklajevanje</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Kopirano v odložišče</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Stanje usklajevanja je kopirano v odložišče.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Trenutno zaradi predhodnih napak ni prezrta nobena datoteka.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 datotek je prezrtih zaradi predhodnih napak.
@@ -1468,6 +1468,34 @@ Te je treba uskladiti znova.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1882,117 +1910,117 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Brez</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Odpri %1 mapo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Upravljane mape:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Odpri mapo '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Preračunavanje količinske omejitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Neznano stanje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Nastavitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Podrobnosti ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Pomoč</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Prijava ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Količinska omejitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Ni nedavno usklajenih predmetov</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
@@ -2099,7 +2127,7 @@ Te je treba uskladiti znova.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
@@ -2159,20 +2187,15 @@ Te je treba uskladiti znova.</translation>
<translation>&Naslov strežnika</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https:// ...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Oznaka napake</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Vpisati je treba naslov URL strežnika, s katerim naj bo vzpostavljena povezava (brez http ali https).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2242,7 +2265,7 @@ Te je treba uskladiti znova.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>V primeru, da lastnega strežnika ownCloud še nimate, za več podrobnosti o možnostih obiščite spletišče <a href="https://owncloud.com">owncloud.com</a>.</translation>
@@ -2252,11 +2275,11 @@ Te je treba uskladiti znova.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Izgrajeno iz predelave Git <a href="%1">%2</a> na %3, %4 z uporabo OCsync %5 in Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Različica %2. Za več podrobnosti obiščite <a href="%3">%4</a></p><p><small>Avtorji Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt in skupina ownCloud Inc.<br>Programski paket je zasnovan na sistemu Mirall avtorja Duncana P. Mac-Vicarja.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 89d10e3..75ea164 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,89 +119,89 @@
<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="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Återuppta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Bekräfta radering av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ansluten till <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<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="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -1395,37 +1395,37 @@ It is not advisable to use it.</source>
<translation>Storlek</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Kopierat till urklipp</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1465,6 +1465,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1877,117 +1905,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Ingen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Öppna %1 mappen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Hanterade mappar:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Öppna mapp '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Beräknar kvot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Okänd status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Kvot n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>%1% av %2 används</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Inga filer har synkroniseras nyligen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
@@ -2094,7 +2122,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
@@ -2154,20 +2182,15 @@ It is not advisable to use it.</source>
<translation>Server &Adress</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Error Label</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Skriv i adressen till servern du vill koppla upp dig mot (utan http eller https)</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2237,7 +2260,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Om du inte har en ownCloud-server ännu, besök <a href="https://owncloud.com">owncloud.com</a> för mer info.</translation>
@@ -2247,11 +2270,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Byggd från Git revision <a href="%1">%2</a> på %3, %4 använt OCsync %5 och Qt %6.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Version %2. För mer information besök <a href="%3">%4</a></p><p><small>Skriven av Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baserad på Mirall av Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index f6a7373..1e6c472 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>หยุดชั่วคราว</translation>
</message>
@@ -119,89 +119,89 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>ดำเนินการต่อ</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>ยืนยันการลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1390,37 +1390,37 @@ It is not advisable to use it.</source>
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1460,6 +1460,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1872,117 +1900,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>เปิดโฟลเดอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>ช่วยเหลือ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -2089,7 +2117,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
@@ -2149,20 +2177,15 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2232,7 +2255,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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"/>
@@ -2242,11 +2265,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 5606007..646295a 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,89 +119,89 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Відновлення</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Підтвердіть видалення каталогу</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1390,37 +1390,37 @@ It is not advisable to use it.</source>
<translation>Розмір</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Скопійовано в буфер обміну</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1460,6 +1460,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1872,117 +1900,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Жодна тека не налаштована для синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Відкрити %1 каталог</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Керовані теки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Допомога</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -2089,7 +2117,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
@@ -2149,20 +2177,15 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2232,7 +2255,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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"/>
@@ -2242,11 +2265,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 9fa2fd8..609f167 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>暂停</translation>
</message>
@@ -119,89 +119,89 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>继续</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>确认移除文件夹</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1390,37 +1390,37 @@ It is not advisable to use it.</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>复制到剪贴板</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1460,6 +1460,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1872,117 +1900,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>打开 %1 目录</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>管理的文件夹：</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
@@ -2089,7 +2117,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
@@ -2149,20 +2177,15 @@ It is not advisable to use it.</source>
<translation>服务器地址（&A）</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>错误标签</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2232,7 +2255,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>如果您还没有一个 ownCloud 服务器，请到 <a href="https://owncloud.com"> 获取更多信息。</translation>
@@ -2242,11 +2265,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 1bf9de9..0c7e745 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>確認移除資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<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="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<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="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>同步中</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -1390,37 +1390,37 @@ It is not advisable to use it.</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>複製至剪貼簿中</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1460,6 +1460,34 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1872,117 +1900,117 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>資料夾 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>尚未指定同步資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>開啟%1資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>管理的資料夾:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>說明</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
@@ -2089,7 +2117,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
@@ -2149,20 +2177,15 @@ It is not advisable to use it.</source>
<translation>伺服器位址</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>錯誤標籤</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2232,7 +2255,7 @@ It is not advisable to use it.</source>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>若您尚未擁有ownCloud伺服器，可參閱<a href="https://owncloud.com">owncloud.com</a> 來獲得更多資訊。</translation>
@@ -2242,11 +2265,11 @@ It is not advisable to use it.</source>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 6b2a726..92d4f14 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="137"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="141"/>
<source>Pause</source>
<translation>Beklet</translation>
</message>
@@ -119,89 +119,89 @@
<translation><b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler gibi klasörler, farklı sınırlara sahip olabilirler.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="139"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="143"/>
<source>Resume</source>
<translation>Devam et</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="290"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<source>Confirm Folder Remove</source>
<translation>Klasör Kaldırma İşlemini Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="295"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="327"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="332"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacaktır, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="582"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="585"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="598"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="680"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="693"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Sunucu alanının %1 / %2 (%%3) kısmı kullanımda.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="732"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>%1 bağlantısı <a href="%2">%3</a> üzerinde yok.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="739"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="431"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="442"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="103"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="107"/>
<source>No account configured.</source>
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="443"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="712"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> ile bağlı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="594"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="607"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1/%2, %3/%4 dosya</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="715"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="728"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation><a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="684"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="697"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -1396,37 +1396,37 @@ Kullanmanız önerilmez.</translation>
<translation>Boyut</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
<source>Retry Sync</source>
<translation>Eşitlemeyi Yeniden Dene</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="70"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Etkinlik listesini panoya kopyala.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>Copied to clipboard</source>
<translation>Panoya kopyalandı</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Eşitleme durumu panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Önceki hata koşullarından dolayı yoksayılmış dosya yok.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="231"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>Önceki hata koşullarından dolayı %1 dosya yoksayıldı.
@@ -1467,6 +1467,34 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
</message>
</context>
<context>
+ <name>Mirall::SettingsDialogMac</name>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <source>%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <source>Activity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <source>Network</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ShibbolethWebView</name>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
@@ -1881,117 +1909,117 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Lütfen oturum açın</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Klasör %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Eşitleme dizini yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Hiçbiri.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Son Değişiklikler</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>%1 dizinini aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Yönetilen dizinler:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>'%1' klasörünü aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="341"/>
<source>Open %1 in browser</source>
<translation>%1'ı tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="343"/>
<source>Calculating quota...</source>
<translation>Kota hesaplanıyor...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Unknown status</source>
<translation>Bilinmeyen durum</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Settings...</source>
<translation>Ayarlar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Details...</source>
<translation>Ayrıntılar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Quit %1</source>
<translation>%1'tan Çık</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Sign in...</source>
<translation>Oturum aç...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Sign out</source>
<translation>Oturumu kapat</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="368"/>
<source>Quota n/a</source>
<translation>Kota kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="375"/>
<source>%1% of %2 in use</source>
<translation>% %1 kullanılıyor. Toplam: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
<translation>Son zamanda eşitlenen öge yok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="403"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Eşitlenen %1/%2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="418"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="445"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
@@ -2098,7 +2126,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<location filename="../src/mirall/owncloudsetuppage.ui" line="129"/>
<location filename="../src/mirall/owncloudsetuppage.ui" line="156"/>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="184"/>
<source>TextLabel</source>
<translation>MetinEtiketi</translation>
</message>
@@ -2158,20 +2186,15 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Sunucu &Adresi</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="102"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
<source>https://...</source>
<translation>https://...</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="160"/>
+ <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
<source>Error Label</source>
<translation>Hata Etiketi</translation>
</message>
- <message>
- <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="99"/>
- <source>Enter the URL of the server that you want to connect to (without http or https).</source>
- <translation>Bağlanmak istediğiniz sunucunun adresini girin (http veya https olmadan).</translation>
- </message>
</context>
<context>
<name>OwncloudWizardResultPage</name>
@@ -2241,7 +2264,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>ownCloudTheme</name>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="90"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="89"/>
<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>Eğer hala bir ownCloud sunucunuz yoksa, daha fazla bilgi için <a href="https://owncloud.com">owncloud.com</a> adresine bakın.</translation>
@@ -2251,11 +2274,11 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<name>ownCloudTheme::about()</name>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
- <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using OCsync %5 and Qt %6.</small><p></source>
- <translation><p><small>Git gözden geçirme <a href="%1">%2</a> ile %3 tarihinde, %4 %5 ve Qt %6 kullanılarak inşa edildi.</small><p></translation>
+ <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
+ <location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
<translation><p>Sürüm %2. Daha fazla bilgi için <a href="%3">%4</a> sitesini ziyaret edin.</p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Anonim.<br>Duncan Mac-Vicar P tarafından yazılan Mirall tabanlıdır.</small></p>%7</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list