[Pkg-owncloud-commits] [owncloud-client] 133/219: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:18 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 c85b6193d54fe9b3958598114f73877d85a96565
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Fri Sep 19 01:25:29 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_cs.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_de.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_el.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_en.ts | 50 ++++++++++++++++++++--------------
translations/mirall_es.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_es_AR.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_et.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_eu.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_fa.ts | 52 ++++++++++++++++++++---------------
translations/mirall_fi.ts | 56 ++++++++++++++++++++++----------------
translations/mirall_fr.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_gl.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_hu.ts | 52 ++++++++++++++++++++---------------
translations/mirall_it.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_ja.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_nl.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_pl.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_pt.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_pt_BR.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_ru.ts | 60 ++++++++++++++++++++++++-----------------
translations/mirall_sk.ts | 64 +++++++++++++++++++++++++-------------------
translations/mirall_sl.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_sv.ts | 54 ++++++++++++++++++++++---------------
translations/mirall_th.ts | 50 ++++++++++++++++++++--------------
translations/mirall_tr.ts | 56 ++++++++++++++++++++++----------------
translations/mirall_uk.ts | 50 ++++++++++++++++++++--------------
translations/mirall_zh_CN.ts | 52 ++++++++++++++++++++---------------
translations/mirall_zh_TW.ts | 54 ++++++++++++++++++++++---------------
29 files changed, 929 insertions(+), 639 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 1213bb3..b4fe1e4 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -695,12 +695,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Escriviu contrasenya</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Versió nova disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 nova versió del client %1 disponible.</p><p><b>%2</b> està disponible per a la baixada. La versió instal·lada és la %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Omet aquesta versió</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Omet aquesta vegada</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Obtingueu l'actualització</translation>
</message>
@@ -1005,7 +1005,12 @@ for additional privileges during the process.</source>
<translation>Comprovació d'actualitzacions al servidor</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No hi ha actualitzacions disponibles. La instal·lació ja es troba en la versió més recent.</translation>
</message>
@@ -1537,7 +1542,7 @@ Proveu de sincronitzar-los de nou.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -2000,67 +2005,72 @@ Proveu de sincronitzar-los de nou.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<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="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<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="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 5b28813..d77b12d 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -695,12 +695,12 @@ Opravdu chcete provést tuto akci?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Zadejte heslo</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Je dostupná nová verze</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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í. Momentálně je nainstalována verze %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Přeskoč tuto verzi</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Tentokrát přeskočit</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Získat aktualizaci</translation>
</message>
@@ -1005,7 +1005,12 @@ si může v průběhu vyžádat dodatečná práva.</translation>
<translation>Kontroluji aktualizační server...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Žádne aktualizace nejsou k dispozici. Používáte aktuální verzi.</translation>
</message>
@@ -1538,7 +1543,7 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Pouze označené adresáře se budou synchronizovat na tento počitač</translation>
</message>
@@ -2001,67 +2006,72 @@ Zkuste provést novou synchronizaci.
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<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="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 566cf55..61ced9a 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -696,12 +696,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Passwort eingeben</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
</context>
<context>
@@ -835,27 +835,27 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Eine neue Version ist verfügbar.</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 - Klients ist verfügbar.</p><p><b>%2</b> steht zum Herunterladen bereit. Die installierte Version ist %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Diese Version auslassen</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Dieses Mal überspringen</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Update durchführen</translation>
</message>
@@ -1006,7 +1006,12 @@ nach zusätzlichen Privilegien während des Prozesses.</translation>
<translation>Aktualisierungsserver wird überprüft...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Keine Aktualisierungen verfügbar. Ihre Installation ist die aktuelle Version.</translation>
</message>
@@ -1538,7 +1543,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Nur markierte Ordner werden auf diesen Computer synchronisiert</translation>
</message>
@@ -2001,67 +2006,72 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index cf8c734..f903c95 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -696,12 +696,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
</context>
<context>
@@ -835,27 +835,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Νέα Έκδοση Διαθέσιμη </translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Παράλειψη αυτής της έκδοσης</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Παράλειψη αυτή τη φορά</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Λήψη ενημέρωσης</translation>
</message>
@@ -1006,7 +1006,12 @@ for additional privileges during the process.</source>
<translation>Έλεγχος διακομιστή ενημερώσεων...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Δεν υπάρχουν ενημερώσεις διαθέσιμες. Η εγκατάστασή σας βρίσκεται στην τελευταία έκδοση.</translation>
</message>
@@ -1538,7 +1543,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Μόνο οι επιλεγμένοι φάκελοι θα συγχρονιστούν σε αυτόν τον υπολογιστή</translation>
</message>
@@ -2001,67 +2006,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 1d25eea..2bc60f4 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -831,27 +831,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation type="unfinished"></translation>
</message>
@@ -1001,7 +1001,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"></translation>
</message>
@@ -1531,7 +1536,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"></translation>
</message>
@@ -1992,67 +1997,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 15b1025..dc8bdf8 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -695,12 +695,12 @@ Está seguro de que desea realizar esta operación?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Introduzca la Contraseña</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nueva versión disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>Está disponible una nueva versión del programa cliente de %1.</p><p><b>%2</b> puede ser descargada. La versión instalada es %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Saltarse esta versión</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Omitir esta vez</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Actualizar</translation>
</message>
@@ -1005,7 +1005,12 @@ pida privilegios adicionales durante el proceso.</translation>
<translation>Verificando el servidor de actualización...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No hay actualizaciones disponibles. Tiene la última versión.</translation>
</message>
@@ -1537,7 +1542,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Solo las carpetas seleccionadas se sincronizarán con esta computadora.</translation>
</message>
@@ -2000,67 +2005,72 @@ Intente sincronizar los archivos nuevamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>origen</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index a7cb875..8ba7db7 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -694,12 +694,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Ingresar contraseña</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
</context>
<context>
@@ -833,27 +833,27 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nueva versión disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Saltear esta vez</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Obtener actualización</translation>
</message>
@@ -1003,7 +1003,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"/>
</message>
@@ -1534,7 +1539,7 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1995,67 +2000,72 @@ Intente sincronizar estos nuevamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>El archivo está en la lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index c25c900..84edb35 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -695,12 +695,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Sisesta parool</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Saadaval on uuem versioon</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Jäta see versioon vahele</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Jäta seekord vahele</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Hangi uuendus</translation>
</message>
@@ -1005,7 +1005,12 @@ täiendavaid õigusi protsessi käigus.</translation>
<translation>Kontrollin uuendusserverit...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Uuendusi pole saadaval. Kasutad kõige viimast versiooni.</translation>
</message>
@@ -1537,7 +1542,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Selle arvutiga sünkroniseeritakse ainult valitud kaustad.</translation>
</message>
@@ -2000,67 +2005,72 @@ Proovi neid uuesti sünkroniseerida.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Fail on märgitud ignoreeritavate nimistus.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>allikas</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 36eef77..a599123 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -695,12 +695,12 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Sartu Pasahitza</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Bertsio berria eskuragarri</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 prest dago. Instalatuta dagoen bersioa %3 da.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Ez eguneratu bertsio hau</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Utzi aldi honetan</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Eskuratu eguneraketa</translation>
</message>
@@ -1005,7 +1005,12 @@ for additional privileges during the process.</source>
<translation>Eguneraketa zerbitzaria galdetzen...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Ez dago eguneraketarik eskuragarri. Zure instalazioa azkenengo bertsioa da.</translation>
</message>
@@ -1537,7 +1542,7 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1998,67 +2003,72 @@ Saiatu horiek berriz sinkronizatzen.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index e977797..3e49623 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -692,7 +692,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>رمز را وارد کنید</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
@@ -829,27 +829,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>نسخه جدید در دسترس است</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>نادیده گرفتن این زمان</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>به دست آوردن به روز رسانی</translation>
</message>
@@ -999,7 +999,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"/>
</message>
@@ -1529,7 +1534,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1990,67 +1995,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 7fa84f0..9395497 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -278,7 +278,7 @@ Aikaa jäljellä yhteensä %5</translation>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
<source>timeout</source>
- <translation type="unfinished"/>
+ <translation>aikakatkaisu</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -693,12 +693,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Anna salasana</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
</context>
<context>
@@ -830,27 +830,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Uusi versio saatavilla</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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-asiakasohjelmistosta on saatavilla.</p><p><b>%2</b> on ladattavissa. Asennettu versio on %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Ohita tämä versio</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Ohita tämän kerran</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Päivitä</translation>
</message>
@@ -1001,7 +1001,12 @@ saattaa kysyä lisäoikeuksia toimenpiteen aikana.</translation>
<translation>Tarkistetaan päivityspalvelinta...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Päivityksiä ei ole saatavilla. Käytössäsi on uusin versio.</translation>
</message>
@@ -1532,7 +1537,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1995,67 +2000,72 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>lähde</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 03cfed5..8a8a4d5 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -695,12 +695,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Entrez le mot de passe</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nouvelle version disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Ignorer cette version.</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Ignorer pour cette fois</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Obtenir la mise à jour</translation>
</message>
@@ -1005,7 +1005,12 @@ peut demander des privilèges additionnels durant le processus.</translation>
<translation>Vérification du serveur de mises à jour...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Aucune mise à jour détectée. Votre installation est à jour.</translation>
</message>
@@ -1537,7 +1542,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -2000,67 +2005,72 @@ Il est déconseillé de l'utiliser.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est présent dans la liste de fichiers à ignorer.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Non autorisé parce-que vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Non autorisé parce-que vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Déplacement non autorisé, élément restauré</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>la source</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index b69b5e6..fa5d992 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -695,12 +695,12 @@ Confirma que quere realizar esta operación?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Escriba o contrasinal</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Hai dispoñíbel unha nova versión</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Omitir esta versión</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Omitir polo de agora</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Obter a actualización</translation>
</message>
@@ -1005,7 +1005,12 @@ actualización pode pedir privilexios adicionais durante o proceso.</translation
<translation>Comprobando o servidor de actualizacións...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Non hai actualizacións dispoñíbeis. A instalación xa está na versión máis recente</translation>
</message>
@@ -1537,7 +1542,7 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -2000,67 +2005,72 @@ Tente sincronizalos de novo.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 12c68a3..2e97f6c 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -692,7 +692,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Jelszómegadás</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
@@ -829,27 +829,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Új verzió érhető el</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Kihagyás ezalkalommal</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Frissítés beszerzése</translation>
</message>
@@ -999,7 +999,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Nincs újabb kiadás. Ez a legfrissebb verzió.</translation>
</message>
@@ -1529,7 +1534,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1990,67 +1995,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 778d5a8..34f3039 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -695,12 +695,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Digita password</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nuova versione disponibile</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Salta questa versione</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Salta questa volta</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Ottieni l'aggiornamento</translation>
</message>
@@ -1004,7 +1004,12 @@ for additional privileges during the process.</source>
<translation>Controllo server degli aggiornamenti...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Non ci sono aggiornamenti disponibili. La tua installazione è aggiornata all'ultima versione.</translation>
</message>
@@ -1536,7 +1541,7 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Saranno sincronizzate con il tuo computer solo le cartelle marcate</translation>
</message>
@@ -1999,67 +2004,72 @@ Prova a sincronizzare nuovamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 4438fb0..354015d 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -695,12 +695,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>パスワードを入力してください</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>新しいバージョンが利用可能です</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>今回のバージョンをスキップ</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>今回はスキップ</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>アップデートを取得</translation>
</message>
@@ -1004,7 +1004,12 @@ for additional privileges during the process.</source>
<translation>アップデートをチェックしています....</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>利用可能なアップデートはありません。最新版がインストールされています。</translation>
</message>
@@ -1535,7 +1540,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>マークしたフォルダのみ、このコンピュータに同期されます。</translation>
</message>
@@ -1998,67 +2003,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できません、復元しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>移動できません、項目を復元しました</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>移動元</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 4acdd88..93b5a7f 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -695,12 +695,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Vul het wachtwoord in</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nieuwe versie beschikbaar</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 beschikbaar.</p><p><b>%2</b> is beschikbaar voor download. De geïnstalleerde versie is %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Deze versie overslaan.</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Deze keer overslaan</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Ophalen update</translation>
</message>
@@ -1005,7 +1005,12 @@ vragen om extra autorisaties tijdens installatie.</translation>
<translation>Controleren updateserver...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Geen updates beschikbaar. Uw installatie is al de laatste versie.</translation>
</message>
@@ -1537,7 +1542,7 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Alleen geselecteerde mappen worden gesynched naar deze computer</translation>
</message>
@@ -2000,67 +2005,72 @@ Probeer opnieuw te synchroniseren.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>De file is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync journal niet openen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>bron</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 1239d03..295d3df 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -695,12 +695,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Wprowadź hasło</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nowa wersja dostępna</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Pomiń tą wersję</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Pomiń tym razem</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Uaktualnij</translation>
</message>
@@ -1005,7 +1005,12 @@ poprosić o dodatkowe uprawnienia podczas tego procesu.</translation>
<translation>Sprawdzanie aktualizacji serwera...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Brak dostępnych aktualizacji. Twoja instalacja jest w najnowszej wersji.</translation>
</message>
@@ -1537,7 +1542,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Tylko zaznaczone foldery będą synchronizowane z tym komputerem</translation>
</message>
@@ -2000,67 +2005,72 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Nie masz uprawnień do dodawania podkatalogów w tym katalogu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Nie masz uprawnień by dodać katalog nadrzędny</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Nie masz uprawnień by dodać pliki w tym katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>źródło</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 04854d2..d690087 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -694,12 +694,12 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Introduza a Palavra-passe</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Por favor introduza %1 password para o utilizador '%2':</translation>
</message>
</context>
<context>
@@ -833,27 +833,27 @@ Itens verificados também serão removidos se evitarem que um diretório seja re
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nova Versão Disponível</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>A nova serão do %1 Cliente está disponivel.</p><p><b>%2</b> está disponível para descarga. A versão instalada é a %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Ignorar esta versão</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Ignorar por agora</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Obter atualização</translation>
</message>
@@ -1003,7 +1003,12 @@ for additional privileges during the process.</source>
<translation>A verificar atualizações no servidor...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Sem novas atualizações. Já tem a última versão instalada.</translation>
</message>
@@ -1534,7 +1539,7 @@ Por favor tente sincronizar novamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Só as pastas verificadas é que serão sincronizadas com este computador</translation>
</message>
@@ -1998,67 +2003,72 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Mover não foi permitido, item restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mover não foi autorizado porque %1 é só de leitura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>a origem</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 278136f..8bb7bf4 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -696,12 +696,12 @@ Você tem certeza que quer executar esta operação?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Entrar Senha</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nova Versão Disponínel</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 %1 de Ciente está disponível.</p><p><b>%2</b> está disponível para baixar. A versão instalada é a %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Pule esta versão</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Pular desta vêz</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Atualizar</translation>
</message>
@@ -1004,7 +1004,12 @@ for additional privileges during the process.</source>
<translation>Verificando servidor de atualização...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Não há atualizações disponíveis. Sua instalação é a versão mais recente.</translation>
</message>
@@ -1535,7 +1540,7 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Somente pastas verificadas serão sincronizadas com este computador</translation>
</message>
@@ -1998,67 +2003,72 @@ Tente sincronizar novamente.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 63858df..c71dfe5 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -157,7 +157,7 @@
<location filename="../src/mirall/accountsettings.cpp" line="654"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 %2 (%3 из %4)</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="658"/>
@@ -168,7 +168,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="675"/>
<source>file %1 of %2</source>
- <translation type="unfinished"/>
+ <translation>файл %1 из %2</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="763"/>
@@ -278,7 +278,7 @@ Total time left %5</source>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
<source>timeout</source>
- <translation type="unfinished"/>
+ <translation>тайм-аут</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -695,12 +695,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Введите пароль</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Доступна новая версия</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Пропустить эту версию</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Пропустить в этот раз</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Получить обновление</translation>
</message>
@@ -1005,7 +1005,12 @@ for additional privileges during the process.</source>
<translation>Проверка наличия обновлений на сервере...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>У Вас установлена новейшая версия</translation>
</message>
@@ -1537,7 +1542,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -2000,67 +2005,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Недопустимо удалить, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение недопустимо, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение недопустимо, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation> Назначение</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>Источник</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index c4219d3..9c297c8 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -106,7 +106,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="76"/>
<source>Choose What to Sync</source>
- <translation type="unfinished"/>
+ <translation>Vybrať čo synchronizovať</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="101"/>
@@ -168,7 +168,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="675"/>
<source>file %1 of %2</source>
- <translation type="unfinished"/>
+ <translation>súbor %1 z %2</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="763"/>
@@ -278,7 +278,7 @@ Celkom zostáva %5</translation>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
<source>timeout</source>
- <translation type="unfinished"/>
+ <translation>vypršal časový limit</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -611,7 +611,7 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="433"/>
<source>Choose What to Sync: You can optionally deselect subfolders you do not wish to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Výber synchronizácie: Môžete dodatočne odznačiť podpriečinky, ktoré nechcete synchronizovať.</translation>
</message>
</context>
<context>
@@ -695,12 +695,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Vložte heslo</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Nová verzia je k dispozícii</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 dostupná nová verzia klienta %1.</p><p><b>%2</b> je dostupná na stiahnutie. Nainštalovaná verzia je %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Preskočiť túto verziu</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Tentoraz preskočiť</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Aktualizovať teraz</translation>
</message>
@@ -1005,7 +1005,12 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translati
<translation>Kontrolujem aktualizačný server...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Žiadne aktualizácie nie sú k dispozícii. Používate aktuálnu verziu.</translation>
</message>
@@ -1271,7 +1276,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="50"/>
<source>Open %1 in Browser</source>
- <translation type="unfinished"/>
+ <translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="77"/>
@@ -1536,7 +1541,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1999,67 +2004,72 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Súbor je zapísaný na zozname ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation>Presunutie nie je dovolené. Položka obnovená.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 2983943..079eb81 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -694,12 +694,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Vnos gesla</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
</context>
<context>
@@ -833,27 +833,27 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Na voljo je novejša različica</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Preskoči to različico</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Posodobitev tokrat preskoči</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Pridobi posodobitve</translation>
</message>
@@ -1004,7 +1004,12 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
<translation>Preverjanje strežnika za posodabljanje ...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Na voljo ni novih posodobitev. Nameščena je najnovejša različica.</translation>
</message>
@@ -1536,7 +1541,7 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1999,67 +2004,72 @@ Te je treba uskladiti znova.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>vir</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 0ea929d..5d49e70 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -695,12 +695,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Ange lösenord</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Vänligen ange %1 lösenord för användare '%2':</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Ny version tillgänglig</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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 klienten är tillgänglig.</p><p><b>%2</b> är tillgänglig för nedladdning. Den installerade versionen är %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Hoppa över denna version</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Hoppa över denna gång</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Hämta uppdatering</translation>
</message>
@@ -1005,7 +1005,12 @@ efter ytterligare privilegier under processen.</translation>
<translation>Kontrollerar uppdateringsservern...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Inga uppdateringar tillgängliga. Din installation är redan den senaste versionen.</translation>
</message>
@@ -1537,7 +1542,7 @@ Försök att synka dessa igen.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -2000,67 +2005,72 @@ Försök att synka dessa igen.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Filen är listad i ignorerings listan.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<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="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<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="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>källan</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index a14bae9..2daf0c5 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -829,27 +829,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation type="unfinished"/>
</message>
@@ -999,7 +999,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"/>
</message>
@@ -1529,7 +1534,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1990,67 +1995,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 4e065f6..36f55a9 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -377,7 +377,7 @@ Toplam kalan süre: %5</translation>
<message>
<location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
- <translation>Sistem tarafından okunamayan dosyaları hariç tut</translation>
+ <translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="779"/>
@@ -695,12 +695,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Parolayı Girin</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
</context>
<context>
@@ -834,27 +834,27 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>Yeni Sürüm Mevcut</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>Bu sürümü atla</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>Bu kez atla</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>Güncellemeyi al</translation>
</message>
@@ -1005,7 +1005,12 @@ bu süreç sırasında ek yetki talebinde bulunabilir.</translation>
<translation>Güncelleme sunucusu denetleniyor...</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Güncelleme yok. Kurulumunuz son sürümde.</translation>
</message>
@@ -1537,7 +1542,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation>Bu bilgisayara sadece seçili klasörler eşitlenecektir</translation>
</message>
@@ -2000,67 +2005,72 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<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="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<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="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<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="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<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="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index b339b71..316a88d 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -831,27 +831,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation type="unfinished"/>
</message>
@@ -1001,7 +1001,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"/>
</message>
@@ -1531,7 +1536,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1992,67 +1997,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index bc1f752..c9b30a2 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -694,7 +694,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>输入密码</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
@@ -833,27 +833,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>新版本可用</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="271"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>跳过这个版本</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>本次跳过</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>获取更新</translation>
</message>
@@ -1003,7 +1003,12 @@ for additional privileges during the process.</source>
<translation>检查更新服务器</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>亲，你使用的已经是最新的版本了</translation>
</message>
@@ -1533,7 +1538,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1996,67 +2001,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
+ <source>Hard links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="361"/>
<source>File is listed on the ignore list.</source>
<translation>文件在忽略列表中。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index f34b14e..78df7fe 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -692,12 +692,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>輸入密碼</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>請輸入使用者 %2 的密碼 %1 :</translation>
</message>
</context>
<context>
@@ -829,27 +829,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="252"/>
+ <location filename="../src/updater/ocupdater.cpp" line="256"/>
<source>New Version Available</source>
<translation>有新版本</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="258"/>
+ <location filename="../src/updater/ocupdater.cpp" line="262"/>
<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"/>
+ <location filename="../src/updater/ocupdater.cpp" line="275"/>
<source>Skip this version</source>
<translation>跳過這個版本</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="272"/>
+ <location filename="../src/updater/ocupdater.cpp" line="276"/>
<source>Skip this time</source>
<translation>跳過這次更新</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="273"/>
+ <location filename="../src/updater/ocupdater.cpp" line="277"/>
<source>Get update</source>
<translation>取得更新</translation>
</message>
@@ -999,7 +999,12 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="91"/>
+ <location filename="../src/updater/ocupdater.cpp" line="89"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/updater/ocupdater.cpp" line="93"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"/>
</message>
@@ -1529,7 +1534,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="263"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1990,67 +1995,72 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
- <source>File is listed on the ignore list.</source>
+ <source>Hard links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="364"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="537"/>
+ <location filename="../src/mirall/syncengine.cpp" line="540"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="649"/>
+ <location filename="../src/mirall/syncengine.cpp" line="652"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="838"/>
+ <location filename="../src/mirall/syncengine.cpp" line="841"/>
<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="845"/>
+ <location filename="../src/mirall/syncengine.cpp" line="848"/>
<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="852"/>
+ <location filename="../src/mirall/syncengine.cpp" line="855"/>
<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="872"/>
+ <location filename="../src/mirall/syncengine.cpp" line="875"/>
<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="888"/>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="891"/>
+ <location filename="../src/mirall/syncengine.cpp" line="912"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="959"/>
+ <location filename="../src/mirall/syncengine.cpp" line="962"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="968"/>
+ <location filename="../src/mirall/syncengine.cpp" line="971"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="969"/>
+ <location filename="../src/mirall/syncengine.cpp" line="972"/>
<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