[Pkg-owncloud-commits] [owncloud-client] 19/89: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Dec 14 01:02:30 UTC 2013
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 7662a6011182dfa64cf4e18224e80957245ee322
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Thu Dec 5 21:24:22 2013 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 58 ++++++++++++++++-----------------
translations/mirall_cs.ts | 58 ++++++++++++++++-----------------
translations/mirall_de.ts | 77 ++++++++++++++++++++++----------------------
translations/mirall_el.ts | 58 ++++++++++++++++-----------------
translations/mirall_en.ts | 58 ++++++++++++++++-----------------
translations/mirall_es.ts | 58 ++++++++++++++++-----------------
translations/mirall_es_AR.ts | 58 ++++++++++++++++-----------------
translations/mirall_et.ts | 58 ++++++++++++++++-----------------
translations/mirall_eu.ts | 58 ++++++++++++++++-----------------
translations/mirall_fa.ts | 58 ++++++++++++++++-----------------
translations/mirall_fi.ts | 58 ++++++++++++++++-----------------
translations/mirall_fr.ts | 58 ++++++++++++++++-----------------
translations/mirall_gl.ts | 77 ++++++++++++++++++++++----------------------
translations/mirall_hu.ts | 58 ++++++++++++++++-----------------
translations/mirall_it.ts | 77 ++++++++++++++++++++++----------------------
translations/mirall_ja.ts | 58 ++++++++++++++++-----------------
translations/mirall_nl.ts | 77 ++++++++++++++++++++++----------------------
translations/mirall_pl.ts | 58 ++++++++++++++++-----------------
translations/mirall_pt.ts | 58 ++++++++++++++++-----------------
translations/mirall_pt_BR.ts | 77 ++++++++++++++++++++++----------------------
translations/mirall_ru.ts | 58 ++++++++++++++++-----------------
translations/mirall_sk.ts | 58 ++++++++++++++++-----------------
translations/mirall_sl.ts | 74 +++++++++++++++++++++---------------------
translations/mirall_sv.ts | 58 ++++++++++++++++-----------------
translations/mirall_th.ts | 58 ++++++++++++++++-----------------
translations/mirall_uk.ts | 58 ++++++++++++++++-----------------
translations/mirall_zh_CN.ts | 58 ++++++++++++++++-----------------
translations/mirall_zh_TW.ts | 58 ++++++++++++++++-----------------
28 files changed, 870 insertions(+), 865 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index f9134ba..59f4652 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -518,14 +518,14 @@
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'.
Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -1063,12 +1063,12 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<translation><p><small><strong>Avís:</strong> La carpeta local no està buida. Escolliu una resolució!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Fitxer local de sincronització</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Configuració avançada d'actualització</translation>
</message>
@@ -1132,8 +1132,8 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<translation>No es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<translation>Mida</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>S'ha copiat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>No hi ha més espai disponible en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1684,48 +1684,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Carpeta &local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Mantén les dades locals</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sincronitza les dades existents amb la nova ubicació.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Si aquesta caixa està marcada, el contingut existent en la carpeta local s'eliminarà per començar una carpeta de sincronització des del servidor.</p><p>No la marqueu si el contingut local s'ha de pujar a la carpeta del servidor.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>%Inicia una sincronització des de zero</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Elimina el contingut de la carpeta local abans de sincronitzar-la usant l'arranjament nou.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Missatge d'estat</translation>
</message>
@@ -1895,12 +1895,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 149fc1c..e4308f4 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -518,14 +518,14 @@
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Tato synchronizace by smazala všechny soubory v místní složce '%1'
Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -1063,12 +1063,12 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<translation><p><small><strong>Varování:</strong> Místní složka není prázdná. Zvolte další postup.</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Místní synchronizovaná složka</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Změnit pokročilé nastavení</translation>
</message>
@@ -1132,8 +1132,8 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<translation>Nedaří se přesunout a zazálohovat složku, protože složka nebo soubor v ní je právě používána jiným programem. Ukončete práci s touto složkou nebo souborem a zkuste to znovu nebo ukončete nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Místní synchronizovaná složka %1 byla vytvořena úspěšně!</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Zkopírováno do schránky</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Na serveru již není k dispozici volné místo.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1685,48 +1685,48 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Místní s&ložka</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Ponechat místní data</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sesynchronizuje současná data do nového umístění.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Pokud je zaškrtnuta tato volba, aktuální obsah v místní složce bude smazán a bude zahájena nová synchronizace ze serveru.</p><p>Nevolte tuto možnost pokud má být místní obsah nahrán do složky na serveru.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Spustit novou synchronizaci</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Smaže obsah místní složky před zahájením synchronizace podle nového nastavení.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Stavová zpráva</translation>
</message>
@@ -1896,12 +1896,12 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 4a1740f..8a8c150 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -354,22 +354,22 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<message>
<location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="273"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="276"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="279"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="450"/>
@@ -519,14 +519,14 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen.
Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -535,17 +535,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1064,12 +1064,12 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<translation><p><small><strong>Achtung:</strong> Das lokale Verzeichnis ist nicht leer. Wähle eine entsprechende Lösung!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Lokaler Ordner für die Synchronisation</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Erweiterte Einstellungen aktualisieren</translation>
</message>
@@ -1133,8 +1133,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<translation>Kann den Ordner nicht entfernen und sichern, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner ode die Datei oder beenden Sie das Setup.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation>
</message>
@@ -1345,45 +1345,46 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Synchronisation wiederholen</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Auf dem Server ist kein Speicherplatz mehr vorhanden.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Aktuell werden keine Dateien, aufgrund vorheriger Fehler, ignoriert.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation type="unfinished"/>
+ <translation>%1 Datei(en) werden aufgrund vorheriger Fehler ignoriert.
+Versuchen Sie diese nochmals zu synchronisieren.</translation>
</message>
</context>
<context>
@@ -1686,48 +1687,48 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Textfeld</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Lokaler Ordner</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Lokale Daten behalten</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Ihre vorhandenen Daten mit einem neuen Ort synchronisieren.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Wenn diese Option gesetzt ist, werden bestehende Inhalte im lokalen Verzeichnis gelöscht, um eine saubere Synchronisation der Serverdaten zu ermöglichen.</p><p>Wählen Sie diese Option nicht, wenn die lokale Inhalte auf den Server übertragen werden sollen.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>Eine saubere (leere) Synchronisation &starten</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Dies löscht die Inhalte des lokalen Ordners vor der Synchronisation unter Verwendung der neuen Einstellungen.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Statusnachricht</translation>
</message>
@@ -1897,12 +1898,12 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
@@ -2092,7 +2093,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation type="unfinished"/>
+ <translation>Synchronisation abgeschlossen, einige Dateien wurden ignoriert.</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 1a4f30f..b62cc75 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -518,30 +518,30 @@
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -1060,12 +1060,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Τοπικός Φάκελος Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Ενημέρωση προχωρημένων ρυθμίσεων</translation>
</message>
@@ -1129,8 +1129,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας φακέλου διότι ο φάκελος ή ένα αρχείο είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Επιτυχής δημιουργία τοπικού καταλόγου %1 για συγχρονισμό!</b></font></translation>
</message>
@@ -1341,42 +1341,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Αντιγραφθηκε στο clipboard</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1681,48 +1681,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Τοπικός Φάκελος</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Διατήρηση τοπικών δεδομένων</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation></small>Συγχρονίζει τα υπάρχοντα δεδομένα σας σε μια νέα τοποθεσία.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Εάν αυτό το κουτί είναι επιλεγμένο, το υπάρχων περιεχόμενο του τοπικού καταλόγου θα διαγραφεί ώστε να αρχίσει ένας νέος συγχρονισμός από το διακομιστή.</p><p>Μην το επιλέξετε εάν το τοπικό περιεχόμενο πρέπει να μεταφορτωθεί στον κατάλογο του διακομιστή.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Έναρξη ενός νέου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Διαγράφει τα περιεχόμενα του τοπικού φακέλου πριν το συγχρονισμό με τις νέες ρυθμίσεις.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Μήνυμα κατάστασης</translation>
</message>
@@ -1892,12 +1892,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 34baed4..5d3c82c 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -520,30 +520,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -1058,12 +1058,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"></translation>
</message>
@@ -1127,8 +1127,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation type="unfinished"></translation>
</message>
@@ -1339,42 +1339,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"></translation>
@@ -1679,48 +1679,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"></translation>
</message>
@@ -1890,12 +1890,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index fbe9c3c..7a40cdf 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -518,14 +518,14 @@
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'.
Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1063,12 +1063,12 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<translation><p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccione otra!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Carpeta local de sincronización</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Actualizar configuración avanzada</translation>
</message>
@@ -1132,8 +1132,8 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<translation>No es posible eliminar y salvaguardar la carpeta debido a que la carpeta o archivo en su interior está abierto por otro programa. Por favor cierre la carpeta o archivo y pulse reintentar o cancelar configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>No hay más espacio disponible en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1684,48 +1684,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Carpeta &local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Mantener datos locales</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sincroniza sus datos existentes a una nueva localización.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p> Si esta casilla está marcada, el contenido existente en el directorio local será eliminado para comenzar una sincronización limpia con el servidor.</p><p>No marque esta casilla si el contenido local debe ser subido al directorio del servidor.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Comenzar una sincronización limpia</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Elimine el contenido de la carpeta local antes de sincronizar utilizando la nueva configuración.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
@@ -1895,12 +1895,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 42f011b..26c09b9 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -518,14 +518,14 @@
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'.
Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1061,12 +1061,12 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<translation><p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccioná otro!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Directorio local de sincronización</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Actualizar configuración avanzada</translation>
</message>
@@ -1130,8 +1130,8 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<translation>No es posible borrar y hacer una copia de seguridad del directorio porque el directorio o archivo en su interior está abierto por otro programa. Cerrá el directorio o archivo y pulsá Reintentar o Cancelar Configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Directorio local %1 creado</b></font></translation>
</message>
@@ -1342,42 +1342,42 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>No hay más espacio disponible en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1682,48 +1682,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Directorio &local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Mantener datos locales</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sincroniza tus datos existentes en una nueva localización.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Comenzar una sincronización limpia</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Borrá el contenido del directorio local antes de sincronizar utilizando la nueva configuración.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
@@ -1894,12 +1894,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 9f11373..29b805a 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -518,14 +518,14 @@
<translation>Viga</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎
Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -1063,12 +1063,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation><p><small><strong>Hoiatus:</strong> Kohalik kataloog ei ole tühi. Vali lahendus!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Kohalik Sync Kataloog</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Uuenda täpsemat seadistust</translation>
</message>
@@ -1132,8 +1132,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Suurus</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopeeri</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Kopeeritud lõikepuhvrisse</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Serveris pole rohkem vaba ruumi.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1685,48 +1685,48 @@ Palun veendu, et võrguühendus toimib.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Kohalik kataloog</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Säilita kohalikud andmed</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sünkroniseerib su olemasolevad andmed uude asukohta.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Kui see valik on märgitud, siis kohalikes kaustades olev sisu kustutatakse, et alustada nullist sünkroniseerimist server.</p><p>Ära märgi seda valikut, kui kohalikus arvutis olevat sisu on vaja serverisse üles laadida.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Alusta sünkroniseeringut nullist</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Kustutab kohalikust kataloogist andmed enne uute seadetega sünkroniseeringu alustamist.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Staatuse teade</translation>
</message>
@@ -1896,12 +1896,12 @@ Palun veendu, et võrguühendus toimib.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index e854785..0be5639 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -518,30 +518,30 @@
<translation>Errorea</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Tamaina</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Arbelera kopiatua</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index cd60590..9b53c81 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -518,30 +518,30 @@
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>نمی توان پوشه را حذف کرد و از آن پشتیبان گرفت زیرا پوشه یا یک فایل در آن در برنامه دیگر باز است .لطفا پوشه یا فایل را ببندید و دوباره امتحان کنید یا راه اندازی را لغو کنید.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>اندازه</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>کپی به کلیپ بورد</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 04df558..1e41c50 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -518,30 +518,30 @@
<translation>Virhe</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Paikallinen synkronointikansio</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Koko</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Kopioitu leikepöydälle</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Palvelimella ei ole enää tallennustilaa käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Paikallinen kansio</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Säilytä paikallinen data</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Synkronoi olemassa olevan datan uuteen sijaintiin.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Käynnistä puhdas synkronointi</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Tilaviesti</translation>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index f83d995..18372be 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -518,14 +518,14 @@
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'.
Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -1063,12 +1063,12 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<translation><p><small><strong>Attention :</strong> Le dossier local n'est pas vide. Résolvez d'abord ce point !</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Dossier de synchronisation local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Mise à jour de la configuration avancée</translation>
</message>
@@ -1132,8 +1132,8 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<translation>Ne peut supprimer et sauvegarder le dossier parce que le dossier ou le fichier concerné est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et taper ré-essayer ou annuler l'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copié dans le presse-papiers</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Plus aucun espace de stockage n'est disponible sur le serveur.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1685,48 +1685,48 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Zone de texte</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Dossier local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Garder des données locales</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Synchroniser vos données existantes vers un nouvel emplacement.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Si cette case est cochée, le contenu existant du dossier local sera supprimé pour démarrer une synchronisation propre depuis le serveur.</p><p>Ne pas cocher si le contenu local doit être téléversé vers les dossiers des serveurs.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Démarrer une synchronisation propre</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Supprime le contenu du répertoire local avant la synchronisation avec les nouveaux paramètres.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Message d'état</translation>
</message>
@@ -1896,12 +1896,12 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement.</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 113744a..ec3ca70 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -353,22 +353,22 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>O elemento non foi sincronizado por mor dos erros anteriores.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="273"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="276"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="279"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="450"/>
@@ -518,14 +518,14 @@
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1».
Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1063,12 +1063,12 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<translation><p><small><strong>Aviso:</strong> O directorio local non está baleiro. Escolla unha resolución!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Sincronización do cartafol local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Actualizar a configuración avanzada</translation>
</message>
@@ -1132,8 +1132,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<translation>Non é posíbel retirar ou facer copias de seguranza do cartafol ou dun ficheiro que estea aberto noutro programa. Peche o cartafol ou o ficheiro e prema en tentar de novo ou cancele o proceso.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation>
</message>
@@ -1344,45 +1344,46 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Volver tentar a sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copiado no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Non hai máis espazo de almacenamento dispoñíbel no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Actualmente non hai ficheiros ignorados por mor de erros anteriores.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation type="unfinished"/>
+ <translation>%1 ficheiros foron ignorados por mor de erros anteriores.
+Tente sincronizalos de novo.</translation>
</message>
</context>
<context>
@@ -1685,48 +1686,48 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Cartafol &local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSeleccionarCartafolLocal</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Conservar os datos locais</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sincroniza os datos existentes na nova localización.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Se se marca esta caixiña, o contido existente no directorio local borrarase para iniciar unha sincronización limpa desde o servidor.</p><p>Non seleccione esta opción se o contido local debe enviarse ao directorio dos servidores.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Iniciar unha sincronización limpa</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Borra o contido do cartafol local antes de sincronizar cos novos axustes..</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Mensaxe de estado</translation>
</message>
@@ -1896,12 +1897,12 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
@@ -2091,7 +2092,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation type="unfinished"/>
+ <translation>A sincronización foi correcta, algúns ficheiros foron ignorados.</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 5dc43f9..95607a2 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -518,30 +518,30 @@
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Méret</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Másolás</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Bemásolva a vágólapra</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Helyi mappa</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Állapotüzenet</translation>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index ed2d7c4..3b787f3 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -353,22 +353,22 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Questo oggetto non è stato sincronizzato a causa di errori precedenti.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="273"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>I link simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="276"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="279"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="450"/>
@@ -518,14 +518,14 @@
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'.
Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -1063,12 +1063,12 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<translation><p><small><strong>Avviso:</strong> la cartella locale non è vuota. Scegli una soluzione.</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Cartella locale di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Aggiorna la configurazione avanzata</translation>
</message>
@@ -1132,8 +1132,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperto in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Cartella locale %1 creta correttamente!</b></font></translation>
</message>
@@ -1344,45 +1344,46 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Riprova Sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Copia la lista attività negli appunti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Spazio di archiviazione insufficiente sul server.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Attualmente nessun file è ignorato a causa di errori precedenti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation type="unfinished"/>
+ <translation>%1 file sono ignorati a causa di errori precedenti.
+Prova a sincronizzare nuovamente.</translation>
</message>
</context>
<context>
@@ -1685,48 +1686,48 @@ Assicurati che la tua connessione sia funzionante.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Carte&lla locale</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Mantieni i dati locali</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sincronizza i dati esistenti con la nuova posizione.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Se questa casella è marcata, il contenuto della cartella locale sarà cancellato per avviare una nuova sincronizzazione dal server.</p><p>Non marcarla se il contenuto locale deve essere caricato nella cartella del server.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>Avvia una nuova &sincronizzazione</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Cancella il contenuto della cartella locale prima di sincronizzare utilizzando le nuove impostazioni.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Messaggio di stato</translation>
</message>
@@ -1896,12 +1897,12 @@ Assicurati che la tua connessione sia funzionante.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominato. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
@@ -2091,7 +2092,7 @@ Assicurati che la tua connessione sia funzionante.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation type="unfinished"/>
+ <translation>Sincronizzazione avvenuta, alcuni file sono stati ignorati.</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 45b2970..2e0b3e3 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -518,14 +518,14 @@
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>この同期により、ローカルの同期フォルダ '%1'にある全ファイルが削除されます。
あなた、またはあなたの管理者がサーバー上のあなたのアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -1063,12 +1063,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation><p><small><strong>警告:</strong> ローカルディレクトリは空ではありません。拡張設定で解決方法を選択してください！</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>ローカル同期フォルダ</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>高度なセットアップを更新</translation>
</message>
@@ -1132,8 +1132,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>このフォルダ内のフォルダまたはファイルが他のプログラムで開かれているため、このフォルダーを削除し、バックアップすることが出来ません。フォルダまたはファイルを閉じて再試行するか、このセットアップをキャンセルしてください。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>ローカルの同期フォルダ %1 は正常に作成されました！</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>サイズ</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>クリップボードにコピー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>サーバー上で利用可能なストレージ容量が足りません。</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1684,48 +1684,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>ローカルフォルダ(&L)</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>ローカルデータを保持(&K)</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>新しい位置に既存データを同期する。</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>チェックした場合、ローカルディレクトリ内に存在するコンテンツはサーバからクリーンな同期を開始するために削除されます。</p><p>もしローカルのコンテンツをサーバのディレクトリにアップロードするなら、チェックしないでください。</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>クリーン同期を開始(&S)</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>新しい設定で同期する前にローカルフォルダのコンテンツを削除する。</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>状態メッセージ</translation>
</message>
@@ -1895,12 +1895,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダの名前の変更はできません。変更したとしても、元の名前に戻ります。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダの名前の変更はできません。名前を Shared に戻してください。</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index c62030c..c8b3537 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -353,22 +353,22 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Het item is niet gesynchroniseerd vanwege eerdere fouten.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="273"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="276"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>De file is opgenomen op de negeerlijst.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="279"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="450"/>
@@ -518,14 +518,14 @@
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'.
Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Dit kan komen doordat de folder ongemerkt gereconfigureerd is of doordat alle be
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -1063,12 +1063,12 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<translation><p><small><strong>Waarschuwing:</strong> De lokale map is niet leeg. Maak een keuze!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Lokale synchronisatiemap</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Update geavanceerde setup</translation>
</message>
@@ -1132,8 +1132,8 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<translation>Kan de backup map niet verwijderen, de map of een bestand in deze map in gebruik is door een ander programma. Sluit aub de map of het bestand en klik op opnieuw proberen of annuleer de installatie.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation>
</message>
@@ -1344,45 +1344,46 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Synchroniseer opnieuw</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Gekopieerd naar het klembord</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Geen opslagruimte meer beschikbaar op de server.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Er zijn nu geen bestanden genegeerd vanwege eerdere fouten.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation type="unfinished"/>
+ <translation>%1 bestanden zijn genegeerd vanwege eerdere fouten.
+Probeer opnieuw te synchroniseren.</translation>
</message>
</context>
<context>
@@ -1685,48 +1686,48 @@ Controleer de werking van uw netwerkverbinding.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TekstLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Lokale map</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Bewaar lokale gegevens</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Synchroniseer uw bestaande data naar een nieuwe lokatie.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Als deze checkbox is aangevinkt zullen bestaande bestanden in de lokale map worden gewist om een schone synchronisatie vanaf de server te starten.</p><p>Vink dit niet aan als de lokale bestanden naar de map op de server zouden moeten worden geupload.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Begin een schone synchronisatie</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Wist de gegevens van de lokale map voordat wordt gesynchroniseerd volgens de nieuwe instellingen.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Statusbericht</translation>
</message>
@@ -1896,12 +1897,12 @@ Controleer de werking van uw netwerkverbinding.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
@@ -2091,7 +2092,7 @@ Controleer de werking van uw netwerkverbinding.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation type="unfinished"/>
+ <translation>Synchronisatie geslaagd, sommige bestabnden werden genegeerd.</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index f3b0439..48178a9 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -518,30 +518,30 @@
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Folder lokalnej synchronizacji</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Zaktualizuj zaawansowane ustawienia</translation>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Skopiuj do schowka</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Brak wolnego miejsca na serwerze.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Lokalny folder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbWybierzLokalnyFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Zachowaj dane lokalne</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Synchronizuje istniejących danych do nowej lokalizacji.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Uruchom nową synchronizację</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Status wiadomości</translation>
</message>
@@ -1889,12 +1889,12 @@ Kliknij</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 90ee9e7..2000ea4 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -519,30 +519,30 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1057,12 +1057,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1126,8 +1126,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
@@ -1338,42 +1338,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1678,48 +1678,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>Pasta Local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Mensagem de estado</translation>
</message>
@@ -1889,12 +1889,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 23f3430..25ebc1e 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -353,22 +353,22 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>O item não está sincronizado porque existem erros prévios.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="273"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="276"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="279"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="450"/>
@@ -518,14 +518,14 @@
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'.
Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -1062,12 +1062,12 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<translation><p><small><strong>Atenção:</strong> O diretório local não está vazio. Escolha a resolução!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Sincronizar Pasta Local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Atualizar configuração avançada</translation>
</message>
@@ -1131,8 +1131,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<translation>Não é possível remover e fazer o backup da pasta porque a pasta ou um arquivo que está na pasta, está aberto em outro program. Por favor feche a pasta ou o arquivo e clique novamente ou cancelar a configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
@@ -1343,45 +1343,46 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Rafazer Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Copiado para área de transferência</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Não existe mais espaço disponível para armazenamento no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Correntemente nenhum arquivo será ignorado por causa de erros prévios.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation type="unfinished"/>
+ <translation>%1 arquivos são ignorados por causa de erros prévios.
+Tente sincronizar novamente.</translation>
</message>
</context>
<context>
@@ -1684,48 +1685,48 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Pasta Local</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Manter dados locais</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Sincroniza seus dados existentes para o novo local..</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><p><body>Se esta opção estiver marcada, os conteúdos existentes no diretório local serão apagados para iniciar uma sincronização limpa a partir do servidor. </p> Não marque esta opção se o conteúdo local deve ser enviado para o diretório de servidores. </p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Iniciar sincronização limpa</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small> Apaga o conteúdo da pasta local antes de sincronizar com as novas configurações. </small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Status da mensagem</translation>
</message>
@@ -1895,12 +1896,12 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
@@ -2090,7 +2091,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation type="unfinished"/>
+ <translation>Sincronizado com Sucesso, alguns arquivos foram ignorados.</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 146381e..6541a9d 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -518,14 +518,14 @@
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Это действие может удалить все файлы в локальной папке '%1'.
Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -1063,12 +1063,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation><p><small><strong>Внимание:</strong> Локальная папка не пуста. Выберите разрешение</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Локальная папка для синхронизации</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Обновить дополнительные настройки</translation>
</message>
@@ -1132,8 +1132,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Невозможно стереть папку и создать её резервную копию так как папка или файл в ней открыты в другой программе. Пожалуйста закройте папку или файл и повторите попытку, либо прервите мастер настройки.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальная папка для синхронизации %1 успешно создана!</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Скопировано в буфер обмена</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>На сервере нет места для хранения информации.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1684,48 +1684,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Локальная папка</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Сохранить локальные данные</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Синхронизирует ваши существующие данные с новым расположением.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Если эта галочка установлена, существующее содержимое в локальной папке будет стёрто, чтобы начать чистую синхронизацию с сервером.</p><p>Не ставьте её, если локальное содержимое должно быть загружено на сервер.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Начать чистую синхронизацию</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Удаляет содержимое локальной папки перед синхронизацией с новыми настройками.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Сообщение о состоянии</translation>
</message>
@@ -1895,12 +1895,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 5218317..36db906 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -518,14 +518,14 @@
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'.
Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -1063,12 +1063,12 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<translation><p><small><strong>Varovanie:</strong> Lokálny priečinok nie je prázdny. Vyberte riešenie!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Lokálny synchronizačný priečinok</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Aktualizovať pokročilé nastavenie</translation>
</message>
@@ -1132,8 +1132,8 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<translation>Nemožno odstrániť a zálohovať priečinok, pretože priečinok alebo súbor v ňom je využívaný iným programom. Prosím zatvorte priečinok alebo súbor a proces opakujte alebo zrušte inštaláciu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation>
</message>
@@ -1344,42 +1344,42 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<translation>Veľkosť</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopírovať</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Skopírované do "clipboard"</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Nedostatok diskovej kapacity na serveri.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1685,48 +1685,48 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Lokálny priečinok</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Nechať lokálne dáta</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Zosynchronizuje vaše existujúce dáta do nového umiestnenia.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Pokiaľ je toto pole zaškrtnuté, existujúci obsah lokálneho priečinka bude vymazaný pre začatie čistej synchronizácie zo servera.</p><p>Nezaškrtnite pokiaľ má byť lokálny obsah nahraný do serverového priečinka.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Začať čistú synchronizáciu</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Vymaže obsah lokálneho priečinka pred synchronizovaním pomocou nových nastavení.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Stavová správa</translation>
</message>
@@ -1896,12 +1896,12 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index c4fde4b..5a37520 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -353,22 +353,22 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Predmeta ni mogoče uskladiti zaradi predhodnih napak.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="273"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="276"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="279"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="450"/>
@@ -518,30 +518,30 @@
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -792,7 +792,7 @@ Program ne bo deloval dovolj zanesljivo. Možne rešitve so zabeležene v dokume
<message>
<location filename="../src/creds/httpcredentials.cpp" line="241"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Vnos gesla</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="242"/>
@@ -1059,12 +1059,12 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<translation><p><small><strong>Opozorilo:</strong> krajevna mapa ni prazna. Kaj storiti?</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Krajevna mapa usklajevanja</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Posodobi napredne nastavitve</translation>
</message>
@@ -1128,8 +1128,8 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<translation>Mape ni mogoče niti odstraniti niti ustvariti varnostne kopije vsebine, saj je mapa oziroma dokument v njej v uporabi. Končajte program in s tem prekinite uporabo mape oziroma dokument ali pa prekinite nastavitev.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation>
</message>
@@ -1340,42 +1340,42 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
- <translation type="unfinished"/>
+ <translation>Ponovno začni usklajevanje</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Kopirano v odložišče</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<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="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Na strežniku ni več razpoložljivega prostora.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1558,7 +1558,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
- <translation type="unfinished"/>
+ <translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="203"/>
@@ -1680,48 +1680,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Krajevna mapa</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbSelectLocalFolder</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Ohrani krajevno shranjene podatke</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Izvedeno bo usklajevanje obstoječih podatkov na novo mesto.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Izbrana možnost določa, da bo do podatki v krajevni mapi v celoti izbrisani, nato pa bo vsebina te mape usklajena z vsebino na strežniku.</p><p>Če želite datoteke v tej mapi poslati na strežnik, te možnosti NE označite.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Začni usklajevanje na novo</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Najprej bo izbrisana celotna vsebina krajevne mape, nato pa bodo datoteke usklajene na novo z novimi nastavitvami.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Sporočilo stanja</translation>
</message>
@@ -1891,12 +1891,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na enako vrednost.</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index a5ea033..a713a36 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -518,14 +518,14 @@
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Denna synk skulle radera alla filer i den lokala mappen '%1'.
Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -534,17 +534,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -1062,12 +1062,12 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<translation><p><small><strong>Varning:</strong> Den lokala mappen är inte tom. Välj en lösning!</small></p></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation>Lokal mapp för synkning</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation>Uppdatera avancerade inställningar</translation>
</message>
@@ -1131,8 +1131,8 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<translation>Kan inte ta bort och göra en säkerhetkopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation>
</message>
@@ -1343,42 +1343,42 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<translation>Storlek</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Kopierat till urklipp</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation>Det finns inte tillräckligt med lagringsutrymme tillgängligt på servern.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1683,48 +1683,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation>&Lokal mapp</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation>pbVäljLokalMapp</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation>&Behåll lokal data</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation><small>Synkroniserar din existerande data till den nya platsen.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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><html><head/><body><p>Om denna ruta är ikryssad så kommer existerande innehåll i den lokala mappen att raderas och en ny synkronisering sker från servern.</p><p>Kryssa inte i denna ruta om data från den lokala mappen ska laddas upp till servern.</p></body></html></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation>&Starta en ren synkronisering</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation><small>Raderar innehållet i den lokala mappen innan synkronisering sker med de nya inställningarna.</small></translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation>Statusmeddelande</translation>
</message>
@@ -1894,12 +1894,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna katalog får ej döpas om. Snälla döp den till Delad</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index fd49a4e..52f8b51 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -518,30 +518,30 @@
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>โฟลเดอร์ภายในเครื่องสำหรับผสานข้อมูล %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 70d951d..da69e8b 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -518,30 +518,30 @@
<translation>Помилка</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Розмір</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>Скопійовано в буфер обміну</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 42df844..fd988ff 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -518,30 +518,30 @@
<translation>错误</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>不能删除或备份文件夹，因为文件夹或其中的一个文件正在被另一个程序打开。请关闭文件或文件夹然后点击重试，或者取消安装。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>大小</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>复制到剪贴板</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 68205b4..7b62082 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -518,30 +518,30 @@
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="764"/>
+ <location filename="../src/mirall/folder.cpp" line="766"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="767"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="771"/>
+ <location filename="../src/mirall/folder.cpp" line="773"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="773"/>
+ <location filename="../src/mirall/folder.cpp" line="775"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="774"/>
+ <location filename="../src/mirall/folder.cpp" line="776"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1056,12 +1056,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="234"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="247"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
<source>Update advanced setup</source>
<translation type="unfinished"/>
</message>
@@ -1125,8 +1125,8 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>無法移除與備份此資料夾，因為有其他的程式正在使用其中的資料夾或者檔案。請關閉使用中的資料夾或檔案並重式或者取消設定。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="413"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="422"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="421"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation>
</message>
@@ -1337,42 +1337,42 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>大小</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="61"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="65"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>Copied to clipboard</source>
<translation>複製至剪貼簿中</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="135"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="136"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="207"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="208"/>
<source>No more storage space available on server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="276"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="278"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="280"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1677,48 +1677,48 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="32"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="223"/>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="262"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="217"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="75"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="91"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
<source>pbSelectLocalFolder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="113"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="107"/>
<source>&Keep local data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="145"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="139"/>
<source><small>Syncs your existing data to new location.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="164"/>
+ <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"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="167"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
<source>&Start a clean sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="199"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="246"/>
+ <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
<translation type="unfinished"/>
</message>
@@ -1888,12 +1888,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="884"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="886"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="888"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</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