[Pkg-owncloud-commits] [owncloud-client] 160/332: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit ffa7f35a875d443aff90e777853552088c317077
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Wed Jul 2 01:25:30 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 72 ++++++++++++------------
translations/mirall_cs.ts | 72 ++++++++++++------------
translations/mirall_de.ts | 72 ++++++++++++------------
translations/mirall_el.ts | 72 ++++++++++++------------
translations/mirall_en.ts | 64 ++++++++++-----------
translations/mirall_es.ts | 72 ++++++++++++------------
translations/mirall_es_AR.ts | 70 +++++++++++------------
translations/mirall_et.ts | 72 ++++++++++++------------
translations/mirall_eu.ts | 72 ++++++++++++------------
translations/mirall_fa.ts | 68 +++++++++++-----------
translations/mirall_fi.ts | 72 ++++++++++++------------
translations/mirall_fr.ts | 72 ++++++++++++------------
translations/mirall_gl.ts | 72 ++++++++++++------------
translations/mirall_hu.ts | 68 +++++++++++-----------
translations/mirall_it.ts | 72 ++++++++++++------------
translations/mirall_ja.ts | 72 ++++++++++++------------
translations/mirall_nl.ts | 72 ++++++++++++------------
translations/mirall_pl.ts | 72 ++++++++++++------------
translations/mirall_pt.ts | 122 ++++++++++++++++++++--------------------
translations/mirall_pt_BR.ts | 130 +++++++++++++++++++++----------------------
translations/mirall_ru.ts | 72 ++++++++++++------------
translations/mirall_sk.ts | 72 ++++++++++++------------
translations/mirall_sl.ts | 84 ++++++++++++++--------------
translations/mirall_sv.ts | 72 ++++++++++++------------
translations/mirall_th.ts | 66 +++++++++++-----------
translations/mirall_tr.ts | 72 ++++++++++++------------
translations/mirall_uk.ts | 66 +++++++++++-----------
translations/mirall_zh_CN.ts | 72 ++++++++++++------------
translations/mirall_zh_TW.ts | 70 +++++++++++------------
29 files changed, 1088 insertions(+), 1088 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index a92c6c7..8f3a818 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -392,57 +392,57 @@ Esteu segur que voleu executar aquesta operació?</translation>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>El servidor no està disponible actualment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -622,8 +622,8 @@ Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Arranjament general</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Hi ha una versió nova del client %1.</p><p><b>%2</b> disponible per baixar. La versió instal·lada és %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>La nova versió %1 està disponible. Si us plau, utilitzeu l'eina d'actualització dels sistemes per instal·lar.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d'un fitxer local</translation>
</message>
@@ -1343,17 +1343,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El fitxer s'ha reanomenat però és part d'una compartició només de lectura. El fixter original s'ha restaurat.</translation>
</message>
@@ -1887,8 +1887,8 @@ Proveu de sincronitzar-los de nou.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>S'ha superat el temps d'espera de la connexió a la xarxa.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Proveu de sincronitzar-los de nou.</translation>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>No es permet perquè no teniu permisos per afegir una carpeta inferior</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet l'eliminació, es restaura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>No es permet moure'l, l'element es restaura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No es permet moure perquè %1 només és de lectura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 72dd1fa..20e62d1 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -392,57 +392,57 @@ Opravdu chcete provést tuto akci?</translation>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Vyčkává na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Server je nyní nedostupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -622,8 +622,8 @@ Opravdu chcete provést tuto akci?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Základní nastavení</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
@@ -807,8 +807,8 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Je k dispozici nová verze klienta %1.</p><p><b>%2</b> je k dispozici ke stažení. Aktuálně nainstalovaná verze je %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ si může v průběhu vyžádat dodatečná práva.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nová verze %1 je dostupná. Pro instalaci použijte, prosím, aktualizační nástroj systému. </translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému.</translation>
</message>
@@ -1343,17 +1343,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
@@ -1888,8 +1888,8 @@ Zkuste provést novou synchronizaci.
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Došlo k vypršení časového limitu síťového spojení.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1958,53 +1958,53 @@ Zkuste provést novou synchronizaci.
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Přesun není povolen, položka obnovena</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 45ac516..ec83903 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -393,57 +393,57 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Der Server ist momentan nicht erreichbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -623,8 +623,8 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Allgemeine Einstellungen</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -661,12 +661,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
@@ -808,8 +808,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Eine neue Version des %1-Clients ist verfügbar.</p><p>Version <b>%2</b> steht zum Download bereit. Die zur Zeit installierte Version: %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -964,8 +964,8 @@ nach zusätzlichen Privilegien während des Prozesses.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Neue Version %1 verfügbar. Bitte nutzen Sie zur Installation das Systemaktualisierungstool.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1328,7 +1328,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
</message>
@@ -1344,17 +1344,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
@@ -1888,8 +1888,8 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Es ist zu einer Zeitüberschreitung der Netzwerkverbindung gekommen.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1958,53 +1958,53 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index b421c09..90ff1c3 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -393,57 +393,57 @@ Are you sure you want to perform this operation?</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
@@ -623,8 +623,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Γενικές Ρυθμίσεις</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -661,12 +661,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
@@ -808,8 +808,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Μια νέα έκδοση του Δέκτη %1 είναι διαθέσιμη. </p><p><b>%2</b>είναι διαθέσιμη για άνοιγμα. Η εγκατεστημένη έκδοση είναι %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -964,8 +964,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Νέα έκδοση %1 διαθέσιμη. Παρακαλώ χρησιμοποιήστε το εργαλείο ενημερώσεων του συστήματος για την εγκαταστήσετε.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1328,7 +1328,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
@@ -1344,17 +1344,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε τον ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1888,8 +1888,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Λήξη χρόνου αναμονής προέκυψε για μια σύνδεση δικτύου. </translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1958,53 +1958,53 @@ It is not advisable to use it.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 8bb9533..49069bd 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -390,57 +390,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -620,7 +620,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
+ <source>General Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -658,12 +658,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -803,7 +803,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -958,7 +958,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1321,7 +1321,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
@@ -1337,17 +1337,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1878,7 +1878,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
+ <source>A network connection timeout happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1948,53 +1948,53 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 7caf663..b75cce1 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -392,57 +392,57 @@ Está seguro de que desea realizar esta operación?</translation>
<translation>Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>El servidor no está disponible en el momento</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -622,8 +622,8 @@ Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Opciones generales</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Introduzca la Contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Una nueva versión del cliente %1 está disponible.</p><p><b>%2</b> está disponible para descarga. La versión instalada es la %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ pida privilegios adicionales durante el proceso.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nueva versión %1 disponible. Use la actualización de sistema para instalarla.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
@@ -1343,17 +1343,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
@@ -1887,8 +1887,8 @@ Intente sincronizar los archivos nuevamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Ha transcurrido el tiempo máximo de conexión a la red.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>No está permitido porque no tiene permisos para añadir un directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>No está permitido, porque no tiene permisos para crear archivos en este directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No está permitido mover, porque %1 es solo lectura.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>origen</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index ad76b3b..c35a616 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -391,57 +391,57 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>El servidor actualmente no está disponible.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -621,8 +621,8 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Configuraciones Generales</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -659,12 +659,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
@@ -806,8 +806,8 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Hay disponible una nueva versión del cliente %1.</p><p><b>%2</b> está disponible para su descarga. La versión instalada es %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -961,7 +961,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1324,7 +1324,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1340,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1882,8 +1882,8 @@ Intente sincronizar estos nuevamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Ha transcurrido el tiempo máximo de conexión a la red.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1952,53 +1952,53 @@ Intente sincronizar estos nuevamente.</translation>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index bb65e8c..05c9050 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -392,57 +392,57 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Server pole hetkel saadaval.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -622,8 +622,8 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Üldised seaded</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Uus versioon %1 kliendist on saadaval.</p><p><b>%2</b> on saadaval alla laadimiseks. Paigaldatud on versioon %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ täiendavaid õigusi protsessi käigus.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Uus versioon %1 on saadaval. Palun kasuta süsteemi uuendushaldurit selle paigaldamiseks.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega</translation>
</message>
@@ -1343,17 +1343,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation>
</message>
@@ -1887,8 +1887,8 @@ Proovi neid uuesti sünkroniseerida.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Toimus võrgukatkestus.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>allikas</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 73408aa..a1cf831 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -388,57 +388,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Zerbitzaria orain ez dago eskuragarri.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Erabiltzaileak Bertan Behera Utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -618,8 +618,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Ezarpen Orokorrak</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -656,12 +656,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
@@ -803,8 +803,8 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>%1 Bezeroaren bertsio berri bat eskuragarri dago.</p><p><b>%2</b> deskargatzeko eskuragarri dago. Instalatutako bertsioa %3 da.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -958,8 +958,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>%1 Bertsio berria eskuragarri dago. Mesedez erabili sistemako eguneraketa tresna instalatzeko.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1321,7 +1321,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1337,17 +1337,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1879,8 +1879,8 @@ Saiatu horiek berriz sinkronizatzen.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Sarearen konexioan denbora-muga gertatu da.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1949,53 +1949,53 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index e482625..6652545 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -388,57 +388,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -618,7 +618,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
+ <source>General Settings</source>
<translation type="unfinished"/>
</message>
<message>
@@ -656,12 +656,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -801,8 +801,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>یک نسخه جدید از %1 نرم افزار در دسترس است. </p><p><b>%2</b> برای دریافت در دسترس است. نسخه نصب شده %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -956,7 +956,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1319,7 +1319,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1335,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1876,8 +1876,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>اتصال به یک شبکه متوقف شده است.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1946,53 +1946,53 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 30f3085..40eb0cf 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -389,57 +389,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Palvelin ei ole käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -619,8 +619,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Yleiset asetukset</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -657,12 +657,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
@@ -802,8 +802,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Uusi versio %1-asiakassovelluksesta on saatavilla.</p><p><b>%2</b> on valmiina ladattavaksi. Tällä hetkellä asennettu versio on %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -958,8 +958,8 @@ saattaa kysyä lisäoikeuksia toimenpiteen aikana.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Uusi versio %1 on saatavilla. Käytä järjestelmän päivitystyökalua asentaaksesi sen.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1322,7 +1322,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1338,17 +1338,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1881,8 +1881,8 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Verkon aikakatkaisuvirhe.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1951,53 +1951,53 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>lähde</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index d24e76f..0c38073 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -392,57 +392,57 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Le serveur est indisponible actuellement.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -622,8 +622,8 @@ Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Paramètres Généraux</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Entrez le mot de passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Une nouvelle version du client de synchronisation %1 est disponible.</p><p><b>%2</b> est disponible au téléchargement. La version installée est %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ peut demander des privilèges additionnels durant le processus.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nouvelle version %1 disponible. Merci d'utiliser les outils de mise à jour système pour l'installer.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier</translation>
</message>
@@ -1343,17 +1343,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
@@ -1887,8 +1887,8 @@ Il est déconseillé de l'utiliser.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Le temps d'attente pour la connexion réseau s'est écoulé.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>la source</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 00367b6..df4924d 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -392,57 +392,57 @@ Confirma que quere realizar esta operación?</translation>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>O servidor non está dispoñíbel actualmente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -622,8 +622,8 @@ Confirma que quere realizar esta operación?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Axustes xerais</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
@@ -807,8 +807,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Hai dispoñíbel unha nova versión do cliente %1.</p><p>Pode descargar a versión <b>%2</b>. A versión instalada é a %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ actualización pode pedir privilexios adicionais durante o proceso.</translation
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Está dispoñíbel unha nova versión %1. Utilice a ferramenta de actualización do sistema para instalala.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation>
</message>
@@ -1343,17 +1343,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
@@ -1887,8 +1887,8 @@ Tente sincronizalos de novo.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Excedeuse do tempo de espera para a conexión á rede.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Tente sincronizalos de novo.</translation>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Non está permitido xa que non ten permiso para engadir un directorio pai</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Non está permitido xa que non ten permiso para engadir ficheiros nese directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index dd49984..585f855 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -388,57 +388,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>A kiszolgáló jelenleg nem érhető el.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -618,8 +618,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Általános beállítások</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -656,12 +656,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -801,7 +801,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -956,7 +956,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1319,7 +1319,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1335,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1876,8 +1876,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Hálózati kapcsolat időtúllépési hiba lépett fel.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1946,53 +1946,53 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 6e78e14..011bf52 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -392,57 +392,57 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Il server è attualmente non disponibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -622,8 +622,8 @@ Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Impostazioni generali</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Digita la password</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Una nuova versione del client %1 è disponibile.</p><p><b>%2</b> è disponibile per lo scaricamento. La versione installata è %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -962,8 +962,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>La nuova versione %1 è disponibile. Utilizza lo strumento di aggiornamento di sistema per installarlo.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1326,7 +1326,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation>
</message>
@@ -1342,17 +1342,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
@@ -1886,8 +1886,8 @@ Prova a sincronizzare nuovamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Si è verificato un timeout sulla connessione alla rete.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1956,53 +1956,53 @@ Prova a sincronizzare nuovamente.</translation>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index be7c35f..84ce472 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -392,57 +392,57 @@ Are you sure you want to perform this operation?</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>サーバーは現在利用できません。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -622,8 +622,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>一般設定</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
@@ -807,8 +807,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>%1 クライアントの新しいバージョンが利用可能です。</p><p><b>%2</b> がダウンロード可能です。インストールされているバージョンは %3 です。<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -962,8 +962,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>新しいバージョン %1 が利用可能です。インストールするには、システムアップデートツールを利用してください。</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1325,7 +1325,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
</message>
@@ -1341,17 +1341,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
@@ -1885,8 +1885,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>ネットワーク接続のタイムアウトが発生しました。</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1955,53 +1955,53 @@ It is not advisable to use it.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>そのディレクトリにサブディレクトリを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>親ディレクトリを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>そのディレクトリにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できません、復元しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>移動できません、項目を復元しました</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>移動元</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 4e6c28b..fad2476 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -392,57 +392,57 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>De server is nu niet beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -622,8 +622,8 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Algemene Instellingen</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Er is een nieuwe versie van de %1-client.</p><p><b>%2</b> kan gedownload worden. De geïnstalleerde versie is %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ vragen om extra autorisaties tijdens installatie.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nieuwe versie %1 beschikbaar. Gebruik de Bijwerkapplicatie voor installeren ervan.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
@@ -1343,17 +1343,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
@@ -1887,8 +1887,8 @@ Probeer opnieuw te synchroniseren.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>verbindingstime-out</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync journal niet openen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verplaatsen niet toegestaan omdat %1 alleen-lezen is</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>bron</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index e7ebc45..d353b90 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -392,57 +392,57 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Serwer jest obecnie niedostępny.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -622,8 +622,8 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Główne ustawienie</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Nowa wersja klienta %1 jest dostępna.</p><p><b>%2</b>jest dostępna do pobrania. Zainstalowana wersja to %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ poprosić o dodatkowe uprawnienia podczas tego procesu.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nowa wersja %1 jest dostępna. Aby ją zainstalować, użyj narzędzia systemowego do aktualizacji.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</translation>
</message>
@@ -1343,17 +1343,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
</message>
@@ -1887,8 +1887,8 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Upłynął limit czasu połączenia.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Niezalecane jest jego użycie.</translation>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>źródło</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 5efedd1..8c6d19d 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -324,7 +324,7 @@ Total time left %5</source>
<message>
<location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
- <translation type="unfinished"/>
+ <translation>%1 foi renomeado para %2 e %3 outros ficheiros foram renomeados.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="426"/>
@@ -335,7 +335,7 @@ Total time left %5</source>
<message>
<location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
- <translation type="unfinished"/>
+ <translation>%1 foi movido para %2 e %3 outros ficheiros foram movidos.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="433"/>
@@ -391,57 +391,57 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>O servidor não está disponível de momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efectuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronização em pausa)</translation>
</message>
@@ -514,7 +514,7 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>O directório seleccionado é uma hiperligação simbólica. Um directório já configurado está contido no directório para a qual a hiperligação está apontada.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -621,8 +621,8 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Configurações gerais</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -659,12 +659,12 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Introduza a Palavra-passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor introduza %1 password para o utilizador '%2':</translation>
</message>
@@ -806,8 +806,8 @@ Itens verificados também serão removidos se evitarem que um diretório seja re
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Nova versão do cliente %1 disponível.</p><p>A versão <b>%2</b> está disponível. A versão instalada é: %3</p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -961,8 +961,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nova versão %1 disponível. Por favor utilize a ferramenta de actualização para a instalar.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1204,7 +1204,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation type="unfinished"/>
+ <translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation>
</message>
</context>
<context>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
</message>
</context>
<context>
@@ -1279,7 +1279,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="50"/>
<source>; Restoration Failed: </source>
- <translation type="unfinished"/>
+ <translation>; Restauração Falhou: </translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="169"/>
@@ -1300,7 +1300,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
- <translation type="unfinished"/>
+ <translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
@@ -1313,7 +1313,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
<source>Could not remove %1 because of a local file name clash</source>
- <translation type="unfinished"/>
+ <translation>Nao foi possivel remover %1 devido a conflito local com nome de ficheiro</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
@@ -1324,9 +1324,9 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local</translation>
</message>
</context>
<context>
@@ -1340,17 +1340,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado.</translation>
</message>
@@ -1566,12 +1566,12 @@ Por favor tente sincronizar novamente.</translation>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="60"/>
<source>Reauthentication required</source>
- <translation type="unfinished"/>
+ <translation>Requerido reautenticação</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="60"/>
<source>Your session has expired. You need to re-login to continue to use the client.</source>
- <translation type="unfinished"/>
+ <translation>A sessão expirou. Precisa reiniciar a sessão para poder continuar usando o cliente.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="98"/>
@@ -1790,12 +1790,12 @@ Por favor tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>CSync falhou no carregamento ou criação do ficheiro jornal. Confirme que tem permissões de escrita e leitura no directório de sincronismo local.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync falhou a escrever o ficheiro do jornal.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="102"/>
@@ -1885,8 +1885,8 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Houve um erro de timeout de rede (fim de tempo)</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1937,7 +1937,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/syncengine.cpp" line="291"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Hiperligações simbólicas não são suportadas em sincronização.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="294"/>
@@ -1955,53 +1955,53 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
- <translation type="unfinished"/>
+ <translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation type="unfinished"/>
+ <translation>Não permitido, porque não tem permissão para adicionar sub-directórios ao directório</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
+ <translation>Não permitido, porque não tem permissão para adicionar o directório principal</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
+ <translation>Não permitido, porque não tem permissão para adicionar ficheiros no directório</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
- <translation type="unfinished"/>
+ <translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
- <translation type="unfinished"/>
+ <translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
- <translation type="unfinished"/>
+ <translation>Mover não foi permitido, item restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
- <translation type="unfinished"/>
+ <translation>Mover não foi autorizado porque %1 é só de leitura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>a origem</translation>
</message>
@@ -2019,7 +2019,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/theme.cpp" line="218"/>
<source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
- <translation type="unfinished"/>
+ <translation><p>Versão %1 Para mais informações por favor visite <a href='%2'>%3</a>.</p><p>Direitos de autor ownCloud, Inc.<p><p>Distribuido por %4 e licenciado através da versão 2.0 GNU General Public License (GPL) .<br>%5 e os %5 logotipos são marca registada de %4 nos<br>Estados Unidos, outros paises ou em ambos.</p></translation>
</message>
</context>
<context>
@@ -2401,7 +2401,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="52"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source>
- <translation type="unfinished"/>
+ <translation><p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5.</small></p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="59"/>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 8d9af58..85af342 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -70,7 +70,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="145"/>
<source>Edit Ignored Files</source>
- <translation>Editar arquivos ignorados</translation>
+ <translation>Editar Arquivos Ignorados</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="152"/>
@@ -91,7 +91,7 @@
<location filename="../src/mirall/accountsettings.ui" line="62"/>
<location filename="../src/mirall/accountsettings.cpp" line="159"/>
<source>Pause</source>
- <translation>Pause</translation>
+ <translation>Pausa</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="69"/>
@@ -126,7 +126,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="318"/>
<source>Confirm Folder Remove</source>
- <translation>Confirma remoção da pasta</translation>
+ <translation>Confirma Remoção da Pasta</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="319"/>
@@ -141,7 +141,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="356"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
- <translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
+ <translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="608"/>
@@ -162,12 +162,12 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>No %1 connection configured.</source>
- <translation>Sem %1 conexão configurada.</translation>
+ <translation>Nenhuma %1 conexão configurada.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="449"/>
<source>Sync Running</source>
- <translation>Sincronização acontecendo</translation>
+ <translation>Sincronização Acontecendo</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="107"/>
@@ -177,7 +177,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="450"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
- <translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
+ <translation>A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la?</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="602"/>
@@ -264,7 +264,7 @@ Total de tempo que falta 5%</translation>
<message>
<location filename="../src/mirall/folder.cpp" line="103"/>
<source>Unable to create csync-context</source>
- <translation>Não é possível criar csync-contexto</translation>
+ <translation>Não é possível criar csync-context</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="159"/>
@@ -366,7 +366,7 @@ Você tem certeza que quer executar esta operação?</translation>
<message>
<location filename="../src/mirall/folder.cpp" line="720"/>
<source>Remove All Files?</source>
- <translation>Deseja remover todos os arquivos?</translation>
+ <translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="722"/>
@@ -392,57 +392,57 @@ Você tem certeza que quer executar esta operação?</translation>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Servidor indisponível no momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
- <translation>Erro de configuração.</translation>
+ <translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -578,7 +578,7 @@ Você tem certeza que quer executar esta operação?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="389"/>
<source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source>
- <translation>Você já está sincronizando <i>%1</i>, que é uma pasta pai de <i>%2</i>.</translation>
+ <translation>Você já está sincronizando <i>%1</i>, que é uma pasta mãe de <i>%2</i>.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="393"/>
@@ -622,8 +622,8 @@ Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Configurações Gerais</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -638,7 +638,7 @@ Você tem certeza que quer executar esta operação?</translation>
<message>
<location filename="../src/mirall/generalsettings.ui" line="40"/>
<source>Use Monochrome Icons</source>
- <translation>Usar ícones monocromáticos</translation>
+ <translation>Usar Ícones Monocromáticos</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="50"/>
@@ -661,12 +661,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Uma nova versão do Cliente %1 está disponível.</p><p><b>%2</b> está disponível para baixar. A versão instalada é %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -856,7 +856,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<message>
<location filename="../src/mirall/networksettings.ui" line="80"/>
<source>Host</source>
- <translation>Servidor</translation>
+ <translation>Host</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="100"/>
@@ -871,7 +871,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<message>
<location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
- <translation>Baixar banda</translation>
+ <translation>Baixar Banda</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="196"/>
@@ -894,7 +894,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<message>
<location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
- <translation>Enviar banda</translation>
+ <translation>Enviar Banda</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="285"/>
@@ -938,7 +938,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<location filename="../src/updater/ocupdater.cpp" line="56"/>
<source>A new update is about to be installed. The updater may ask
for additional privileges during the process.</source>
- <translation>Uma nova atualização está prestes a ser instalado. O atualizador pode pedir por privilégios adicionais durante o processo.</translation>
+ <translation>Uma nova atualização está prestes a ser instalada. O atualizador pode pedir por privilégios adicionais durante o processo.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="77"/>
@@ -962,8 +962,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nova versão %1 disponível. Por favor, use a ferramenta de atualização do sistema para atualizar.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1034,7 +1034,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudhttpcredspage.cpp" line="43"/>
<source>Enter user credentials</source>
- <translation>Entre com suas credenciais</translation>
+ <translation>Entre com as credenciais do usuário</translation>
</message>
<message>
<location filename="../src/wizard/owncloudhttpcredspage.cpp" line="159"/>
@@ -1102,7 +1102,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
- <translation><font color="green">Conectado com sucesso a %1: versão %2 %3 (%4)</font><br/><br/></translation>
+ <translation><font color="green">Conectado com sucesso a %1: 2% versão %3 (%4)</font><br/><br/></translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
@@ -1169,7 +1169,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
<source>The folder creation resulted in HTTP error code %1</source>
- <translation>A criação da pasta resultou em um erro HTTP %1</translation>
+ <translation>A criação da pasta resultou em um erro do código HTTP %1</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
@@ -1205,7 +1205,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo em que nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
+ <translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
</message>
</context>
<context>
@@ -1325,7 +1325,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation>
</message>
@@ -1341,17 +1341,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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>
+ <translation>Esta pasta não pode ser renomeada. Ela será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
@@ -1468,7 +1468,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="114"/>
<source>The sync status has been copied to the clipboard.</source>
- <translation>O estado de sincronização foi copiado para o clipboard.</translation>
+ <translation>O estado de sincronização foi copiado para a área de transferência.</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="229"/>
@@ -1806,7 +1806,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
- <translation>A hora do sistema neste cliente é diferente do que o tempo de sistema no servidor. Por favor, use um serviço de sincronização de tempo (NTP) no servidor e máquinas clientes para que os tempos continuam os mesmos.</translation>
+ <translation>A hora do sistema neste cliente é diferente da hora de sistema no servidor. Por favor, use um serviço de sincronização de tempo (NTP) no servidor e máquinas clientes para que as datas continuam as mesmas.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="110"/>
@@ -1826,7 +1826,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
- <translation>Erro fatal permanente do CSync.</translation>
+ <translation>Erro fatal de parametro do CSync.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="122"/>
@@ -1885,8 +1885,8 @@ Tente sincronizar novamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Atingido o tempo limite para conexão à rede.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1912,7 +1912,7 @@ Tente sincronizar novamente.</translation>
<location filename="../src/mirall/syncengine.cpp" line="172"/>
<location filename="../src/mirall/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
- <translation>CSync: sem espaço disponível no servidor %1.</translation>
+ <translation>CSync: Sem espaço disponível no servidor %1.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="178"/>
@@ -1927,7 +1927,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="185"/>
<source>An internal error number %1 happened.</source>
- <translation>Um ocorreu um erro interno de número %1.</translation>
+ <translation>Ocorreu um erro interno de número %1.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="244"/>
@@ -1955,53 +1955,53 @@ Tente sincronizar novamente.</translation>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Não permitido porque você não tem permissão de criar sub-pastas nesta pasta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Não permitido porque você não tem permissão de criar pastas mãe</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Não permitido porque você não tem permissão de adicionar arquivos a esta pasta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Não é permitido mover porque %1 é somente para leitura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
@@ -2202,7 +2202,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
<source>Status message</source>
- <translation>Status da mensagem</translation>
+ <translation>Mensagem de status</translation>
</message>
</context>
<context>
@@ -2406,7 +2406,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="59"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
- <translation><p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>BAseado em Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
+ <translation><p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Baseado em Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
</context>
<context>
@@ -2510,7 +2510,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success</source>
- <translation>Sucesso da Sincronização</translation>
+ <translation>Sucesso na Sincronização</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 5368a49..319e15d 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -391,57 +391,57 @@ Are you sure you want to perform this operation?</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Сервер недоступен.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -621,8 +621,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Общие настройки</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -659,12 +659,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
@@ -806,8 +806,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Новая версия программы-клиента %1 доступна.</p><p><b>%2</b> доступна для скачивания. Установленная версия %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -962,8 +962,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Доступна новая версия %1. Для её установки перейдите в раздел обновления системы.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1326,7 +1326,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1342,17 +1342,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1886,8 +1886,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Произошёл таймаут соединения сети.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1956,53 +1956,53 @@ It is not advisable to use it.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation> Назначение</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>Источник</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index db13124..b6163e0 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -391,57 +391,57 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Sever momentálne nie je prístupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
@@ -621,8 +621,8 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Všeobecné nastavenia</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -659,12 +659,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
@@ -806,8 +806,8 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Nová verzia %1 klienta je dostupná.</p><p><b>%2</b> je dostupný na stiahnutie. Nainštalovaná verzia je %3.</p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -962,8 +962,8 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translati
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Nová verzia %1 je dostupná. Pre inštaláciu použite aktualizačný nástroj systému. </translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1326,7 +1326,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý</translation>
</message>
@@ -1342,17 +1342,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený.</translation>
</message>
@@ -1885,8 +1885,8 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Skončil sa časový limit sieťového pripojenia.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1955,53 +1955,53 @@ Nie je vhodné ju používať.</translation>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 5681ac2..7834f57 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -391,57 +391,57 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Strežnik trenutno ni na voljo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -621,8 +621,8 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Splošne nastavitve</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -659,12 +659,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
@@ -806,8 +806,8 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>Na voljo je nova različica odjemalca %1.</p><p>Datoteka <b>%2</b> je na voljo za prejem. Trenutno je nameščena različica %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -962,8 +962,8 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Na voljo je nova različica %1. Priporočeno je uporabiti sistemsko orodje za nameščanje. </translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1206,7 +1206,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation>Mape ni mogoče odstraniti in ustvariti njeno varnostno kopijo, saj je mapa oziroma dokument v njej odprt v drugem programu. Zaprite mapo/dokument ali prekinite namestitev.</translation>
+ <translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt v z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
</message>
</context>
<context>
@@ -1326,7 +1326,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Datoteko %1 ne morete preimenovati v %2 zaradin nesoglasja s krajevnim imenom datoteke</translation>
</message>
@@ -1342,17 +1342,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka.</translation>
</message>
@@ -1568,12 +1568,12 @@ Te je treba uskladiti znova.</translation>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="60"/>
<source>Reauthentication required</source>
- <translation>Zahtevano je vnovično preverjanje pristnosti</translation>
+ <translation>Zahtevano je vnovično overjanje istovetnosti</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="60"/>
<source>Your session has expired. You need to re-login to continue to use the client.</source>
- <translation>Vaša seja je potekla.Ponovno se prijavite za nadaljevanje z uporabo odjemalca.</translation>
+ <translation>Seja je potekla. Ponovno se je treba prijaviti in nadaljevati z uporabo odjemalca.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="98"/>
@@ -1886,8 +1886,8 @@ Te je treba uskladiti znova.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Poskus vzpostavitve povezave je časovno potekel.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1956,55 +1956,55 @@ Te je treba uskladiti znova.</translation>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
- <translation type="unfinished"/>
+ <translation>cilj</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
- <translation type="unfinished"/>
+ <translation>vir</translation>
</message>
</context>
<context>
@@ -2402,7 +2402,7 @@ Te je treba uskladiti znova.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="52"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source>
- <translation><p><small>Zgrajeno s pomočjo Git revizije <a href="%1">%2</a> na %3, %4 uporablja Qt %5.</small></p></translation>
+ <translation><p><small>Zgrajeno s predelavo Git <a href="%1">%2</a> na %3, %4 s podporo Qt %5.</small></p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="59"/>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index f5dceba..2b90c94 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -392,57 +392,57 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Servern är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -622,8 +622,8 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Allmänna inställningar</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Ange lösenord</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vänligen ange %1 lösenord för användare '%2':</translation>
</message>
@@ -807,8 +807,8 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>En ny version av %1 Client är tillgänglig.</p><p><b>%2</b> är tillgänglig för nedladdning. Den installerade versionen är %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ efter ytterligare privilegier under processen.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Ny version %1 tillgänglig. Använd systemets uppdateringsverktyg för att installera det.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</translation>
</message>
@@ -1343,17 +1343,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna mapp får ej döpas om. Vänligen döp den till Delad igen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes.</translation>
</message>
@@ -1887,8 +1887,8 @@ Försök att synka dessa igen.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Ett anslutningsfel mot nätverket uppstod.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Försök att synka dessa igen.</translation>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Inte behörig att radera, återställer</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Det gick inte att genomföra flytten, objektet återställs</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>källan</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 830cd8f..abd0e2b 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -388,57 +388,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -618,7 +618,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
+ <source>General Settings</source>
<translation type="unfinished"/>
</message>
<message>
@@ -656,12 +656,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -801,7 +801,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -956,7 +956,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1319,7 +1319,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1335,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1876,8 +1876,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1946,53 +1946,53 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index c1446e9..cd2abf8 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -392,57 +392,57 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Sunucu şu an kullanılabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -622,8 +622,8 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>Genel Ayarlar</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -660,12 +660,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
@@ -807,8 +807,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>%1 İstemcisi yeni sürümü mevcut.</p><p><b>%2</b> artık indirilebilir. Kurulu sürüm %3.<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -963,8 +963,8 @@ bu süreç sırasında ek yetki talebinde bulunabilir.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>Yeni sürüm %1 mevcut. Lütfen kurulum için sistem güncelleştirme aracını kullanın.</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1327,7 +1327,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
</message>
@@ -1343,17 +1343,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
@@ -1887,8 +1887,8 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Bir ağ zaman aşımı meydana geldi.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1957,53 +1957,53 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation>Taşımaya izin verilmedi, öge geri alındı</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index f65c091..2161751 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -391,57 +391,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>Сервер наразі недоступний.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -621,7 +621,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
+ <source>General Settings</source>
<translation type="unfinished"/>
</message>
<message>
@@ -659,12 +659,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -804,7 +804,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -959,7 +959,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1322,7 +1322,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1338,17 +1338,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1879,8 +1879,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>Час під'єднання до мережі вичерпався.</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1949,53 +1949,53 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index ff82b5e..1e5bcd7 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -391,57 +391,57 @@ Are you sure you want to perform this operation?</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation>服务器当前是不可用的。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>上次同步已成功，不过一些文件出现了警告。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
@@ -621,8 +621,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>常规设置</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -659,12 +659,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>输入密码</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -806,8 +806,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>新版本的 %1 客户端可用。</p><p><b>%2</b> 已经开放下载。已安装的版本是 %3。<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -961,8 +961,8 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
- <translation>有 %1 新版本了.请使用系统更新工具升级。</translation>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1324,7 +1324,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1340,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1881,8 +1881,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>网络连接超时。</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1951,53 +1951,53 @@ It is not advisable to use it.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 22bf2b3..ab35143 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -388,57 +388,57 @@ Are you sure you want to perform this operation?</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="752"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="755"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="758"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="761"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="772"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="775"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="778"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="781"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="787"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
@@ -618,8 +618,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
- <source>General Setttings</source>
- <translation>一般設定</translation>
+ <source>General Settings</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -656,12 +656,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="282"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="281"/>
<source>Enter Password</source>
<translation>輸入密碼</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="283"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="282"/>
<source>Please enter %1 password for user '%2':</source>
<translation>請輸入使用者 %2 的密碼 %1 :</translation>
</message>
@@ -801,8 +801,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
- <translation><p>%1 客戶端有新版本了。</p><p><b>%2</b> 可供下載，目前安裝的版本是 %3 。<p></translation>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -956,7 +956,7 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
- <source>New version %1 available. Please use the systems update tool to install it.</source>
+ <source>New version %1 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1319,7 +1319,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1335,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="272"/>
<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/propagatorjobs.cpp" line="235"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="274"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="289"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1876,8 +1876,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
- <source>A network connection timeout happend.</source>
- <translation>網路連線逾時。</translation>
+ <source>A network connection timeout happened.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="160"/>
@@ -1946,53 +1946,53 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="564"/>
+ <location filename="../src/mirall/syncengine.cpp" line="567"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="733"/>
+ <location filename="../src/mirall/syncengine.cpp" line="736"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="740"/>
+ <location filename="../src/mirall/syncengine.cpp" line="743"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="747"/>
+ <location filename="../src/mirall/syncengine.cpp" line="750"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="765"/>
+ <location filename="../src/mirall/syncengine.cpp" line="768"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="780"/>
- <location filename="../src/mirall/syncengine.cpp" line="800"/>
+ <location filename="../src/mirall/syncengine.cpp" line="783"/>
+ <location filename="../src/mirall/syncengine.cpp" line="803"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="848"/>
+ <location filename="../src/mirall/syncengine.cpp" line="853"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="855"/>
+ <location filename="../src/mirall/syncengine.cpp" line="862"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="856"/>
+ <location filename="../src/mirall/syncengine.cpp" line="863"/>
<source>the source</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