[Pkg-owncloud-commits] [owncloud-client] 69/218: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 17 14:30:46 UTC 2015
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 8495d097bb1f0c31087bd7ee4441f4e27f048b5c
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Tue Sep 8 02:19:14 2015 -0400
[tx-robot] updated from transifex
---
translations/client_ca.ts | 122 ++++++++++++++++-----------------
translations/client_cs.ts | 122 ++++++++++++++++-----------------
translations/client_de.ts | 158 +++++++++++++++++++++----------------------
translations/client_el.ts | 122 ++++++++++++++++-----------------
translations/client_en.ts | 94 ++++++++++++-------------
translations/client_es.ts | 128 +++++++++++++++++------------------
translations/client_es_AR.ts | 102 ++++++++++++++--------------
translations/client_et.ts | 118 ++++++++++++++++----------------
translations/client_eu.ts | 102 ++++++++++++++--------------
translations/client_fa.ts | 98 +++++++++++++--------------
translations/client_fi.ts | 114 +++++++++++++++----------------
translations/client_fr.ts | 132 ++++++++++++++++++------------------
translations/client_gl.ts | 122 ++++++++++++++++-----------------
translations/client_hu.ts | 98 +++++++++++++--------------
translations/client_it.ts | 122 ++++++++++++++++-----------------
translations/client_ja.ts | 122 ++++++++++++++++-----------------
translations/client_nb_NO.ts | 116 +++++++++++++++----------------
translations/client_nl.ts | 132 ++++++++++++++++++------------------
translations/client_pl.ts | 110 +++++++++++++++---------------
translations/client_pt.ts | 141 +++++++++++++++++++-------------------
translations/client_pt_BR.ts | 122 ++++++++++++++++-----------------
translations/client_ru.ts | 122 ++++++++++++++++-----------------
translations/client_sk.ts | 116 +++++++++++++++----------------
translations/client_sl.ts | 116 +++++++++++++++----------------
translations/client_sr.ts | 116 +++++++++++++++----------------
translations/client_sv.ts | 106 ++++++++++++++---------------
translations/client_th.ts | 122 ++++++++++++++++-----------------
translations/client_tr.ts | 122 ++++++++++++++++-----------------
translations/client_uk.ts | 116 +++++++++++++++----------------
translations/client_zh_CN.ts | 118 ++++++++++++++++----------------
translations/client_zh_TW.ts | 100 +++++++++++++--------------
31 files changed, 1813 insertions(+), 1838 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 3311f57..98bc15f 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 hauria de ser una carpeta, però no ho és.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -626,8 +626,8 @@ Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>El camí seleccionat no és un directori!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -809,8 +809,8 @@ Temps restant total %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>L'àlies del directori és un nom descriptiu per la connexió de ssincronització.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1077,12 +1077,10 @@ Compte: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Els fitxers o carpetes que concordin amb algun patró no es sincronitzaran.
-
-Els elements que poden ser eliminats s'eliminaran si impedeixen que una carpeta sigui eliminada. Això és útil per les metadades.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1404,13 +1402,13 @@ privilegis addicionals durant el procés.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sincronita el directori '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Avís:</strong> La carpeta local no està buida. Escolliu una resolució!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1757,8 +1755,8 @@ No és aconsellada usar-la.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>S'ha eliminat un fitxer o carpeta de la compartició nómés de lectura, però la restauració ha fallat: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1770,8 +1768,8 @@ No és aconsellada usar-la.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>No s'ha pogut crear el directori %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1783,8 +1781,8 @@ No és aconsellada usar-la.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>No s'ha pogut esborrar la carpeta '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2517,11 +2515,6 @@ No és aconsellada usar-la.</translation>
<translation>Èxit.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync ha fallat en carregar o crear el fitxer de revista. Assegureu-vos que yeniu permisos de lectura i escriptura en la carpeta local de sincronització.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync ha fallat en carregar el fitxer del registre de transaccions. El fitxer està corromput.</translation>
@@ -2592,9 +2585,34 @@ No és aconsellada usar-la.</translation>
<translation>CSync ha fallat en no implementar el permís denegat.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync ha intentat crear una carpeta que ja existeix.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2612,11 +2630,6 @@ No és aconsellada usar-la.</translation>
<translation>Aturat per l'usuari</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>El nom del fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
@@ -2627,19 +2640,19 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>El servei no està disponible temporalment</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>S'ha produït un error en obrir una carpeta</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Error en llegir la carpeta.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>El servei no està disponible temporalment</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2703,21 +2716,6 @@ No és aconsellada usar-la.</translation>
<translation>S'ignora degut al filtre a «Trieu què sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2979,6 +2977,11 @@ No és aconsellada usar-la.</translation>
<translation>Servidor</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Comença una sin&cronització des de zero (esborra la carpeta local!)</translation>
@@ -3004,11 +3007,6 @@ No és aconsellada usar-la.</translation>
<translation>&Mantén les dades locals</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Si aquesta caixa està marcada, el contingut existent en la carpeta local s'eliminarà per començar una carpeta de sincronització des del servidor.</p><p>No la marqueu si el contingut local s'ha de pujar a la carpeta del servidor.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Sincronitza-ho tot des del servidor</translation>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index bda8d07..80a8cea 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 by měl být adresář, ale není.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Opravdu chcete provést tuto akci?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Vybraná cesta nevede do adresáře!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Celkový zbývající čas %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Alias složky je popisné jméno pro tuto synchronizaci.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Uživatel: %2
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Soubory či adresáře vyhovující masce nebudou synchronizovány.
-
-Položky u kterých je povoleno smazání budou vymazány, pokud by bránily odstranění adresáře. Toto je užitečné pro metadata.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1403,13 +1401,13 @@ můžete být požádáni o dodatečná oprávnění.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Synchronizovat adresář '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Varování:</strong> Místní adresář není prázdný. Zvolte další postup.</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1756,8 +1754,8 @@ Nedoporučuje se jí používat.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1769,8 +1767,8 @@ Nedoporučuje se jí používat.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>nepodařilo se vytvořit adresář %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1782,8 +1780,8 @@ Nedoporučuje se jí používat.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Nezdařilo se odstranění adresáře '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2522,11 +2520,6 @@ Nedoporučuje se jí používat.</translation>
<translation>Úspěch.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v místní synchronizované složce.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Nezdařilo se načtení žurnálovacího souboru CSync. Žurnálovací soubor je poškozený.</translation>
@@ -2597,9 +2590,34 @@ Nedoporučuje se jí používat.</translation>
<translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync se pokusilo vytvořit adresář, který již existuje.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2617,11 +2635,6 @@ Nedoporučuje se jí používat.</translation>
<translation>Zrušeno uživatelem</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Připojený adresář je na serveru dočasně nedostupný</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Jméno souboru obsahuje neplatné znaky, které neumožňují synchronizaci mezi různými platformami.</translation>
@@ -2632,19 +2645,19 @@ Nedoporučuje se jí používat.</translation>
<translation>Selhal přístup pro CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Služba je dočasně nedostupná</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Došlo k chybě při otvírání adresáře</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Chyba při čtení adresáře.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Služba je dočasně nedostupná</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2708,21 +2721,6 @@ Nedoporučuje se jí používat.</translation>
<translation>Ignorováno podle nastavení "vybrat co synchronizovat"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2984,6 +2982,11 @@ Nedoporučuje se jí používat.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Spustit novou synchroniza&ci (Smaže lokální data!)</translation>
@@ -3009,11 +3012,6 @@ Nedoporučuje se jí používat.</translation>
<translation>&Ponechat místní data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Pokud je zaškrtnuta tato volba, aktuální obsah v místním adresáři bude smazán a bude zahájena nová synchronizace ze serveru.</p><p>Nevolte tuto možnost pokud má být místní obsah nahrán do adresáře na serveru.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Ses&ynchronizovat vše ze serveru</translation>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index c9a8746..023bd4b 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -425,8 +425,8 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Der gewählte Pfad ist kein Ordner!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -698,7 +698,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
<source>Click this button to add a folder to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Wählen Sie diese Schaltfläche, um einen zu synchronisierenden Ordner hinzuzufügen.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
@@ -808,8 +808,8 @@ Gesamtzeit übrig %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Der Verzeichnis-Alias ist der beschreibende Name der Synchronisationsverbindung.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -949,7 +949,7 @@ Gesamtzeit übrig %5</translation>
<message>
<location filename="../src/gui/generalsettings.ui" line="40"/>
<source>For System Tray</source>
- <translation type="unfinished"/>
+ <translation>Für das Systembenachrichtungsfeld</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="43"/>
@@ -1042,7 +1042,7 @@ Konto: %3
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="20"/>
<source>Global Ignore Settings</source>
- <translation type="unfinished"/>
+ <translation>Globale Ignorier-Einstellungen</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="26"/>
@@ -1052,7 +1052,7 @@ Konto: %3
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="36"/>
<source>Files Ignored by Patterns</source>
- <translation type="unfinished"/>
+ <translation>Nach Muster ignorierte Dateien</translation>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.ui" line="55"/>
@@ -1076,7 +1076,7 @@ Konto: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1373,7 +1373,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="177"/>
<source>Update Check</source>
- <translation type="unfinished"/>
+ <translation>Aktualitätsprüfung</translation>
</message>
</context>
<context>
@@ -1400,13 +1400,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Verzeichnis '%1' synchronisieren</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Achtung:</strong> Das lokale Verzeichnis ist nicht leer. Wähle eine entsprechende Lösung!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1753,8 +1753,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Eine Datei oder Verzeichnis wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1766,8 +1766,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1779,8 +1779,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Konnte Verzeichnis '%1'; nicht entfernen.</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2210,7 +2210,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/gui/sharedialog.cpp" line="528"/>
<source>Please Set Password</source>
- <translation type="unfinished"/>
+ <translation>Bitte wählen Sie ein Passwort:</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="564"/>
@@ -2518,11 +2518,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Erfolgreich</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync konnte die Journaldatei nicht laden. Die Journaldatei ist beschädigt.</translation>
@@ -2593,9 +2588,34 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2613,11 +2633,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Abbruch durch den Benutzer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Das eingehängte Verzeichnis ist auf dem Server vorübergehend nicht verfügbar</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Dateiname enthält Zeichen die nicht auf allen Betriebssystemen dargestellt werden können.</translation>
@@ -2628,19 +2643,19 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Der Dienst ist vorübergehend nicht erreichbar</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Beim Öffnen eines Verzeichnisses ist ein Fehler aufgetreten.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Der Dienst ist vorübergehend nicht erreichbar</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2675,7 +2690,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="407"/>
<source>Stat failed.</source>
- <translation type="unfinished"/>
+ <translation>Stat fehlgeschlagen.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="425"/>
@@ -2704,21 +2719,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2904,7 +2904,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="447"/>
<source>Sign out everywhere</source>
- <translation>Überall abmelden...</translation>
+ <translation>Überall abmelden</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="455"/>
@@ -2980,9 +2980,14 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
- <translation type="unfinished"/>
+ <translation>Saubere Syn&chronisation beginnen (entfernt lokalen Ordner!)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
@@ -3005,11 +3010,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>&Lokale Daten behalten</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Wenn diese Option gesetzt ist, werden bestehende Inhalte im lokalen Verzeichnis gelöscht, um eine saubere Synchronisation der Serverdaten zu ermöglichen.</p><p>Wählen Sie diese Option nicht, wenn die lokale Inhalte auf den Server übertragen werden sollen.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Alle Daten vom Server s&ynchronisieren</translation>
@@ -3166,22 +3166,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/libsync/utility.cpp" line="114"/>
<source>%L1 TB</source>
- <translation type="unfinished"/>
+ <translation>%L1 TB</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="117"/>
<source>%L1 GB</source>
- <translation type="unfinished"/>
+ <translation>%L1 GB</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="120"/>
<source>%L1 MB</source>
- <translation type="unfinished"/>
+ <translation>%L1 MB</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="123"/>
<source>%L1 kB</source>
- <translation type="unfinished"/>
+ <translation>%L1 kB</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="126"/>
@@ -3191,37 +3191,37 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln year(s)</source>
- <translation type="unfinished"/>
+ <translation>%Ln Jahr(e)</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln month(s)</source>
- <translation type="unfinished"/>
+ <translation>%Ln Monat(e)</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln day(s)</source>
- <translation type="unfinished"/>
+ <translation>%Ln Tag(e)</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln hour(s)</source>
- <translation type="unfinished"/>
+ <translation>%Ln Stunde(n)</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln minute(s)</source>
- <translation type="unfinished"/>
+ <translation>%Ln Minute(n)</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="309"/>
<source>%Ln second(s)</source>
- <translation type="unfinished"/>
+ <translation>%Ln Sekunde(n)</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="319"/>
<source>0 seconds</source>
- <translation type="unfinished"/>
+ <translation>0 Sekunden</translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="334"/>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index e2f391c..8540dfd 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>Ο %1 θα έπρεπε να είναι κατάλογος αρχείων αλλά δεν είναι.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Η επιλεγμένη διαδρομή δεν είναι κατάλογος!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -809,8 +809,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Το όνομα καταλόγου είναι ένα περιγραφικό όνομα για αυτή τη σύνδεση συγχρονισμού.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1077,12 +1077,10 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Αρχεία ή κατάλογοι αρχείων που ταιριάζουν με αυτό το πρότυπο δεν θα συγχρονιστούν.
-
-Τα στοιχεία όπου επιτρέπεται η διαγραφή θα διαγράφονται εάν εμποδίζουν την αφαίρεση ενός καταλόγου αρχείων. Αυτό είναι χρήσιμο για μετα-δεδομένα.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1404,13 +1402,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Συγχρονισμός του φακέλου '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Προειδοποίηση:</strong> Ο τοπικός κατάλογος αρχείων δεν είναι άδειος. Διαλέξτε μια λύση!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1757,8 +1755,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1770,8 +1768,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>αδυναμία δημιουργίας καταλόγου %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1783,8 +1781,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Αδυναμία αφαίρεσης καταλόγου '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2523,11 +2521,6 @@ It is not advisable to use it.</source>
<translation>Επιτυχία.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Το CSync απέτυχε να φορτώσει ο αρχείο καταλόγου. Το αρχείο καταλόγου έχει καταστραφεί.</translation>
@@ -2598,9 +2591,34 @@ It is not advisable to use it.</source>
<translation>Το CSync απέτυχε λόγω απόρριψης μη-διαχειρίσιμων δικαιωμάτων.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>Το CSync προσπάθησε να δημιουργήσει ένα κατάλογο που υπάρχει ήδη.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2618,11 +2636,6 @@ It is not advisable to use it.</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Ο προσαρτημένος κατάλογος δεν είναι προσωρινά διαθέσιμος στον δικομιστή</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Το όνομα αρχείου περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
@@ -2633,19 +2646,19 @@ It is not advisable to use it.</source>
<translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Η υπηρεσία δεν είναι διαθέσιμη προσωρινά</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Προέκυψε σφάλμα κατά το άνοιγμα ενός καταλόγου</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Σφάλμα κατά την ανάγνωση του καταλόγου.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Η υπηρεσία δεν είναι διαθέσιμη προσωρινά</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2709,21 +2722,6 @@ It is not advisable to use it.</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
@@ -2985,6 +2983,11 @@ It is not advisable to use it.</source>
<translation>Διακομιστής</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>&Έναρξη καθαρού συγχρονισμού (Διαγράφει τον τοπικό φάκελο!)</translation>
@@ -3010,11 +3013,6 @@ It is not advisable to use it.</source>
<translation>&Διατήρηση τοπικών δεδομένων</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Εάν αυτό το κουτί είναι επιλεγμένο, το υπάρχων περιεχόμενο του τοπικού καταλόγου θα διαγραφεί ώστε να αρχίσει ένας νέος συγχρονισμός από το διακομιστή.</p><p>Μην το επιλέξετε εάν το τοπικό περιεχόμενο πρέπει να μεταφορτωθεί στον κατάλογο του διακομιστή.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Σ&υγχρονισμός όλων από τον διακομιστή</translation>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 78f0052..7405db2 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -426,7 +426,7 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
+ <source>%1 should be a folder but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -624,7 +624,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -809,7 +809,7 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1073,7 +1073,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"></translation>
@@ -1397,12 +1397,12 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1749,7 +1749,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1762,7 +1762,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
+ <source>could not create folder %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1775,7 +1775,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2513,11 +2513,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"></translation>
@@ -2588,8 +2583,33 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2608,11 +2628,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
@@ -2623,18 +2638,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2699,21 +2714,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
@@ -2975,6 +2975,11 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"></translation>
@@ -3000,11 +3005,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"></translation>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 0b037c0..ec07a80 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 debería ser un directorio, pero no lo es.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>¡La ruta seleccionada no es un directorio!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -772,17 +772,17 @@ Tiempo restante %5</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
<source>Waiting...</source>
- <translation type="unfinished"/>
+ <translation>Esperando...</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
<source>Waiting for %n other folder(s)...</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando por %n otras carpetas...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
<source>Preparing to sync...</source>
- <translation type="unfinished"/>
+ <translation>Preparando para sincronizar...</translation>
</message>
</context>
<context>
@@ -808,8 +808,8 @@ Tiempo restante %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>El alias de la carpeta es un nombre descriptivo para esta conexión de sincronización.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Cuenta: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Archivos o directorios que coincidan con un patrón no serán sincronizados.
-
-Los elementos cuya eliminación está permitida serán eliminados si impiden que un directorio sea eliminado. Esto es útil por sus metadatos.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1402,13 +1400,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sincronizar el directorio '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccione otra!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1755,8 +1753,8 @@ No se recomienda usarla.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Un archivo o directorio fue eliminado de una carpeta compartida en modo de solo lectura, pero la recuperación falló: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1768,8 +1766,8 @@ No se recomienda usarla.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>No se ha podido crear el directorio %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1781,8 +1779,8 @@ No se recomienda usarla.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>No se ha podido eliminar el directorio '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2518,11 +2516,6 @@ No se recomienda usarla.</translation>
<translation>Completado con éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync falló al cargar el archivo de diaro. El darchivo de diario se encuentra corrupto.</translation>
@@ -2593,9 +2586,34 @@ No se recomienda usarla.</translation>
<translation>CSync: Falló debido a un permiso denegado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync trató de crear un directorio que ya existe.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2613,11 +2631,6 @@ No se recomienda usarla.</translation>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Temporalmente, el directorio en uso no se encuentra disponible en el servidor</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>El nombre del archivo contiene caracteres inválidos que no pueden ser sincronizados entre las plataformas.</translation>
@@ -2628,19 +2641,19 @@ No se recomienda usarla.</translation>
<translation>CSync ha fallado al acceder</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>El servicio no está disponible temporalmente </translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Se produjo un error mientras se abría el directorio.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Error durante la lectura del directorio.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>El servicio no está disponible temporalmente </translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2704,21 +2717,6 @@ No se recomienda usarla.</translation>
<translation>Ignorado por que se encuentra en la lista negra de "elija qué va a sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2980,6 +2978,11 @@ No se recomienda usarla.</translation>
<translation>Servidor</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Empezar con una sincronización &limpia (¡Elimina la carpeta local!)</translation>
@@ -3005,11 +3008,6 @@ No se recomienda usarla.</translation>
<translation>&Mantener datos locales</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p> Si esta casilla está marcada, el contenido existente en el directorio local será eliminado para comenzar una sincronización limpia con el servidor.</p><p>No marque esta casilla si el contenido local debe ser subido al directorio del servidor.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Sincronizar todo desde el servidor</translation>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 3d4d437..bceba5d 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 debería ser un directorio, pero no lo es.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -806,8 +806,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>El alias de directorio es un nombre descriptivo para esta conexión de sincronización</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1070,7 +1070,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1394,13 +1394,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Advertencia:</strong>El directorio local no está vacío. ¡Seleccioná otro!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1746,7 +1746,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1759,7 +1759,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
+ <source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1772,7 +1772,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2504,11 +2504,6 @@ It is not advisable to use it.</source>
<translation>Éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2579,9 +2574,34 @@ It is not advisable to use it.</source>
<translation>CSync: Falló debido a un permiso denegado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>Csync trató de crear un directorio que ya existía.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2599,11 +2619,6 @@ It is not advisable to use it.</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2614,18 +2629,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2690,21 +2705,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
@@ -2966,6 +2966,11 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2991,11 +2996,6 @@ It is not advisable to use it.</source>
<translation>&Mantener datos locales</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Si esta caja es activada, el contenido existente en el directorio local será borrado para empezar una sincronización limpia desde el servidor</p><p>No activar esto si el contenido local debe ser actualizado con el directorio del servidor.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 74b702a..ecdf0c0 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,8 +624,8 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Valitud asukoht pole kaust!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -807,8 +807,8 @@ Aega kokku jäänud %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Kataloogi alias on kirjeldav nimi selle sünkroniseeringu ühenduse jaoks.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1395,13 +1395,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sünkrooni kaust '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Hoiatus:</strong> Kohalik kataloog ei ole tühi. Vali lahendus!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1748,8 +1748,8 @@ Selle kasutamine pole soovitatav.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Fail või kataloog oli eemaldatud kirjutamisõiguseta jagamisest, kuid taastamine ebaõnnestus: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1761,8 +1761,8 @@ Selle kasutamine pole soovitatav.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>ei suuda luua kataloogi %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1774,8 +1774,8 @@ Selle kasutamine pole soovitatav.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Ei suutnud eemaldada kataloogi '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2508,11 +2508,6 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Korras.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2583,9 +2578,34 @@ Selle kasutamine pole soovitatav.</translation>
<translation>CSync ebaõnnestus ligipääsu puudumisel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>Csync proovis tekitada kataloogi, mis oli juba olemas.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2603,11 +2623,6 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2618,19 +2633,19 @@ Selle kasutamine pole soovitatav.</translation>
<translation>CSyncile ligipääs ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Teenus pole ajutiselt saadaval</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Kataloogi avamisel tekkis viga</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Teenus pole ajutiselt saadaval</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2694,21 +2709,6 @@ Selle kasutamine pole soovitatav.</translation>
<translation>"Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2970,6 +2970,11 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2995,11 +3000,6 @@ Selle kasutamine pole soovitatav.</translation>
<translation>&Säilita kohalikud andmed</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Kui see valik on märgitud, siis kohalikes kaustades olev sisu kustutatakse, et alustada nullist sünkroniseerimist server.</p><p>Ära märgi seda valikut, kui kohalikus arvutis olevat sisu on vaja serverisse üles laadida.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index fff0397..ca214d0 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 karpeta bat izan behar zen baina ez da.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Geratzen den denbora %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Direktorioaren ezizena sinkronizazio konexioaren izen deskriptiboa da.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1395,12 +1395,12 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1748,7 +1748,7 @@ Ez da gomendagarria erabltzea.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1761,8 +1761,8 @@ Ez da gomendagarria erabltzea.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>Ezin izan da %1 karpeta sortu</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1774,7 +1774,7 @@ Ez da gomendagarria erabltzea.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2506,11 +2506,6 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Arrakasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2581,9 +2576,34 @@ Ez da gomendagarria erabltzea.</translation>
<translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2601,11 +2621,6 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2616,18 +2631,18 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2692,21 +2707,6 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
@@ -2968,6 +2968,11 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Zerbitzaria</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2993,11 +2998,6 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Mantendu datu lo&kalak</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index daea6e0..7910e27 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 باید یک پوشه باشد اما نیست.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -806,7 +806,7 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1070,7 +1070,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1394,12 +1394,12 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1746,7 +1746,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1759,7 +1759,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
+ <source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1772,7 +1772,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2504,11 +2504,6 @@ It is not advisable to use it.</source>
<translation>موفقیت</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2579,9 +2574,34 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2599,11 +2619,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2614,18 +2629,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2690,21 +2705,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
@@ -2966,6 +2966,11 @@ It is not advisable to use it.</source>
<translation>سرور</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2991,11 +2996,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index b0e3f19..cf9d125 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -623,8 +623,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Valittu polku ei ole kansio!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -806,7 +806,7 @@ Aikaa jäljellä yhteensä %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1070,7 +1070,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1394,13 +1394,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Synkronoi kansio '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Varoitus:</strong> Paikallinen kansio ei ole tyhjä. Valitse ratkaisu!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1747,7 +1747,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1760,8 +1760,8 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>kansion %1 luominen epäonnistui</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1773,8 +1773,8 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Ei voitu poistaa kansiota '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2507,11 +2507,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Onnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2582,9 +2577,34 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync yritti luoda olemassa olevan kansion.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2602,11 +2622,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Keskeytetty käyttäjän toimesta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2617,19 +2632,19 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Palvelu ei ole juuri nyt käytettävissä</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Virhe kansiota avatessa</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Virhe kansiota luettaessa.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Palvelu ei ole juuri nyt käytettävissä</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2693,21 +2708,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä alikansioita kyseiseen kansioon</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä ylätason kansiota</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
@@ -2969,6 +2969,11 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Palvelin</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Aloita &puhdas synkronointi (poistaa paikallisen kansion!)</translation>
@@ -2994,11 +2999,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>&Säilytä paikallinen data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>S&ynkronoi kaikki palvelimelta</translation>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 465d548..f1b04eb 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 doit être un répertoire, mais ce n'en est pas un.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Le chemin sélectionné n'est pas un répertoire !</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -772,17 +772,17 @@ Temps restant total %5</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
<source>Waiting...</source>
- <translation type="unfinished"/>
+ <translation>En attente ...</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
<source>Waiting for %n other folder(s)...</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
<source>Preparing to sync...</source>
- <translation type="unfinished"/>
+ <translation>Préparation à la synchronisation</translation>
</message>
</context>
<context>
@@ -808,8 +808,8 @@ Temps restant total %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>L'alias du dossier est un nom descriptif pour cette synchronisation.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Compte : %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Les fichiers ou dossiers dont les noms correspondent à un modèle ne seront pas synchronisés.
-
-Les éléments dont la suppression est permise seront supprimés s'ils empêchent l'effacement d'un répertoire. C'est utile pour les fichiers de méta-données.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1403,13 +1401,13 @@ L'assistant peut demander des privilèges additionnels durant le processus.
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Synchroniser le dossier '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Attention :</strong> Le dossier local n'est pas vide. Résolvez d'abord ce point !</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1756,8 +1754,8 @@ Il est déconseillé de l'utiliser.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Un fichier ou un dossier a été supprimé d'un partage en lecture seule, mais la restauration a échoué : %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1769,8 +1767,8 @@ Il est déconseillé de l'utiliser.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>impossible de créer le répertoire %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1782,8 +1780,8 @@ Il est déconseillé de l'utiliser.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Impossible de supprimer le répertoire '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2451,12 +2449,12 @@ Il est déconseillé de l'utiliser.</translation>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="66"/>
<source>Untrusted Certificate</source>
- <translation type="unfinished"/>
+ <translation>Certificat non fiable</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="135"/>
<source>Cannot connect securely to <i>%1</i>:</source>
- <translation type="unfinished"/>
+ <translation>Impossible de se connecter de manière sécurisée à <i>%1</i> :</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="171"/>
@@ -2522,11 +2520,6 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Succès.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture et écriture dans le répertoire de synchronisation local.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync a échoué à charger du fichier journal. Le fichier journal est corrompu.</translation>
@@ -2597,9 +2590,34 @@ Il est déconseillé de l'utiliser.</translation>
<translation>CSync a échoué en raison d'une erreur de permission non prise en charge.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync a tenté de créer un répertoire déjà présent.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2617,11 +2635,6 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Interrompu par l'utilisateur</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Le dossier monté est temporairement indisponible sur le serveur</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Le nom de fichier contient des caractères non valides qui ne peuvent être synchronisés entre plate-formes.</translation>
@@ -2632,19 +2645,19 @@ Il est déconseillé de l'utiliser.</translation>
<translation>CSync n'a pas pu accéder à</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Le service est temporairement indisponible.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Une erreur est survenue lors de l'ouverture d'un dossier.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Erreur lors de la lecture du dossier.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Le service est temporairement indisponible.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2708,21 +2721,6 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Ignoré à cause de la liste noire "Choisir le contenu à synchroniser".</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Non autorisé car vous n'avez pas la permission d'ajouter des dossiers parents</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
@@ -2984,6 +2982,11 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Serveur</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Réinitialiser la syn&chronisation (Supprime le dossier local !)</translation>
@@ -3009,11 +3012,6 @@ Il est déconseillé de l'utiliser.</translation>
<translation>&Garder les données locales</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Si cette case est cochée, le contenu existant du dossier local sera supprimé pour démarrer une synchronisation propre depuis le serveur.</p><p>Ne pas cocher si le contenu local doit être téléversé vers le serveur.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>S&ynchroniser tout le contenu depuis le serveur</translation>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 53309ac..3495c03 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 debería ser un directorio e non o é.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Confirma que quere realizar esta operación?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>A ruta seleccionada non é dun directorio!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Tempo total restante %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>O alias de directorio é un nome descritivo para esta conexión de sincronización.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Conta: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Os ficheiros ou directorios que coincidan cun patrón non se sincronizarán.
-
-Os elementos aos que se lles permite a eliminación tamén se eliminarán se impiden retirar un directorio. Isto é útil para os metadatos.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1403,13 +1401,13 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sincronizar o directorio«%1»</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Aviso:</strong> O directorio local non está baleiro. Escolla unha resolución!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1756,8 +1754,8 @@ Recomendámoslle que non o use.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Foi retirado un ficheiro ou directorio desde unha compartición de só lectura, mais non foi posíbel a súa restauración: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1769,8 +1767,8 @@ Recomendámoslle que non o use.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>non foi posíbel crear o directorio %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1782,8 +1780,8 @@ Recomendámoslle que non o use.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Non foi posíbel retirar o directorio «%1»;</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2519,11 +2517,6 @@ Recomendámoslle que non o use.</translation>
<translation>Correcto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Produciuse un fallo en CSync ao cargar o ficheiro de rexistro. O ficheiro de rexistro está estragado.</translation>
@@ -2594,9 +2587,34 @@ Recomendámoslle que non o use.</translation>
<translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSYNC tenta crear un directorio que xa existe.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2614,11 +2632,6 @@ Recomendámoslle que non o use.</translation>
<translation>Interrompido polo usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>O directorio montado non está temporalmente dispoñible no servidor</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>O nome de ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
@@ -2629,19 +2642,19 @@ Recomendámoslle que non o use.</translation>
<translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>O servizo está temporalmente inaccesíbel.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Produciuse un erro ao abrir o directorio.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Produciuse un erro ao ler o directorio</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>O servizo está temporalmente inaccesíbel.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2705,21 +2718,6 @@ Recomendámoslle que non o use.</translation>
<translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2981,6 +2979,11 @@ Recomendámoslle que non o use.</translation>
<translation>Servidor</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Iniciar unha sincronización &limpa (Borra o cartafol local!)</translation>
@@ -3006,11 +3009,6 @@ Recomendámoslle que non o use.</translation>
<translation>&Conservar os datos locais</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Se se marca esta caixiña, o contido existente no directorio local borrarase para iniciar unha sincronización limpa desde o servidor.</p><p>Non seleccione esta opción se o contido local debe enviarse ao directorio dos servidores.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Sincronizar &todo o contido do servidor</translation>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index bfe1b12..dc1e49b 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 könyvtár kell legyen, de nem az.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -622,7 +622,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -804,7 +804,7 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1068,7 +1068,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1392,12 +1392,12 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1744,7 +1744,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1757,7 +1757,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
+ <source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1770,7 +1770,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2502,11 +2502,6 @@ It is not advisable to use it.</source>
<translation>Sikerült.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2577,9 +2572,34 @@ It is not advisable to use it.</source>
<translation>CSync hiba, nincs kezelési jogosultság.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>A CSync megpróbált létrehozni egy már létező mappát.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2597,11 +2617,6 @@ It is not advisable to use it.</source>
<translation>Felhasználó megszakította</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2612,18 +2627,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2688,21 +2703,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
@@ -2964,6 +2964,11 @@ It is not advisable to use it.</source>
<translation>Kiszolgáló</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2989,11 +2994,6 @@ It is not advisable to use it.</source>
<translation>&Helyi adatok megtartása</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Ha ez a négyzet be van jelölve, akkor minden törölve lesz a helyi könyvtárból, amint elindul a tiszta szinkronizálás.</p><p>Ne jelöld be, ha a helyi fájljaidat felszeretnéd tölteni a szerver könyvtárába.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>M&inden szinkronizálása a szerverről</translation>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 8d0e799..3b0287f 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 dovrebbe essere una cartella.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Il percorso selezionato non è una cartella!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Totale tempo rimanente %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>L'alias della cartella è un nome descrittivo per questa connessione di sincronizzazione. </translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>I file e le cartelle che verificano un modello non saranno sincronizzati.
-
-Gli elementi per i quali è consentita l'eliminazione, saranno eliminati se impediscono la rimozione di una cartella. Utile per i metadati.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1402,13 +1400,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sincronizza la cartella '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Avviso:</strong> la cartella locale non è vuota. Scegli una soluzione.</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1755,8 +1753,8 @@ Non è consigliabile utilizzarlo.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1768,8 +1766,8 @@ Non è consigliabile utilizzarlo.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>impossibile creare la cartella %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1781,8 +1779,8 @@ Non è consigliabile utilizzarlo.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Impossibile rimuovere la cartella '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2519,11 +2517,6 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Successo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync non è riuscito a caricare o a creare il file di registro. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync non è riuscito a scrivere il file di registro. Il file di registro è danneggiato.</translation>
@@ -2594,9 +2587,34 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync ha cercato di creare una cartella già esistente.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2614,11 +2632,6 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Interrotto dall'utente</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>La cartella montata è temporaneamente indisponibile sul server</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Il nome del file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
@@ -2629,19 +2642,19 @@ Non è consigliabile utilizzarlo.</translation>
<translation>CSync non è riuscito ad accedere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Il servizio è temporaneamente non disponibile</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Si è verificato un errore durante l'apertura di una cartella</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Errore durante la lettura della cartella.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Il servizio è temporaneamente non disponibile</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2705,21 +2718,6 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2981,6 +2979,11 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Avvia una nuova sin&cronizzazione (Cancella la cartella locale!)</translation>
@@ -3006,11 +3009,6 @@ Non è consigliabile utilizzarlo.</translation>
<translation>&Mantieni i dati locali</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Se questa casella è marcata, il contenuto della cartella locale sarà cancellato per avviare una nuova sincronizzazione dal server.</p><p>Non marcarla se il contenuto locale deve essere caricato nella cartella del server.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Sincroni&zza tutto dal server</translation>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index e1be63c..7b9c80a 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>指定のパスは、ディレクトリではありません！</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>このディレクトリのエイリアスは、この同期接続用の記述名です。</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>パターンに一致するファイルやディレクトリは同期されません。
-
-指定のディレクトリやファイルを削除させたくなくても、削除が許可されていて上記のパターンに含まれていない場合削除されてしまいます。例えばメタデータファイルに有用です。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1402,13 +1400,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>ディレクトリ'%1'を同期</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>警告:</strong> ローカルディレクトリは空ではありません。拡張設定で解決方法を選択してください！</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1754,8 +1752,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1767,8 +1765,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>ディレクトリ %1 を作成できませんでした</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1780,8 +1778,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>ディレクトリ '%1'を削除できません;</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2516,11 +2514,6 @@ It is not advisable to use it.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSyncはジャーナルファイルの読み込みに失敗しました。ジャーナルファイルが破損しています。</translation>
@@ -2591,9 +2584,34 @@ It is not advisable to use it.</source>
<translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2611,11 +2629,6 @@ It is not advisable to use it.</source>
<translation>ユーザーによって中止されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>サーバー上のマウント済ディレクトリが一時的に利用できません。</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>異なるプラットフォームOS間で利用できない不正な文字コードがファイル名に含まれているため、同期できません。</translation>
@@ -2626,19 +2639,19 @@ It is not advisable to use it.</source>
<translation>CSync は接続できませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>サーバーは一時的に利用できません</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>ディレクトリを開く際にエラーが発生しました</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>ディレクトリ読み込みエラー</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>サーバーは一時的に利用できません</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2702,21 +2715,6 @@ It is not advisable to use it.</source>
<translation>"同期対象先" ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>そのディレクトリにサブディレクトリを追加する権限がありません</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>親ディレクトリを追加する権限がありません</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>そのディレクトリにファイルを追加する権限がありません</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
@@ -2978,6 +2976,11 @@ It is not advisable to use it.</source>
<translation>サーバー</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>クリーン同期を開始(ローカルフォルダーは削除されます！)(&C)</translation>
@@ -3003,11 +3006,6 @@ It is not advisable to use it.</source>
<translation>ローカルデータを保持(&K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>チェックした場合、ローカルディレクトリ内に存在するコンテンツはサーバーからクリーンな同期を開始するために削除されます。</p><p>もしローカルのコンテンツをサーバーのディレクトリにアップロードするなら、チェックしないでください。</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>サーバーからすべてのファイルを同期(&Y)</translation>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 52db19b..d61ee3d 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 skal være en mappe men er ikke det.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Er du sikker på at du vil utføre denne operasjonen?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Tid som gjenstår %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Mappe-aliaset er et beskrivende navn for denne synkroniseringsforbindelsen.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1396,13 +1396,13 @@ kan be om ytterligere rettigheter under behandlingen.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Synkroniser mappen '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Advarsel:</strong> Den lokale mappen er ikke tom. Velg en løsning!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1749,8 +1749,8 @@ Det er ikke tilrådelig å bruke den.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>En fil eller mappe ble fjernet fra en deling med lesetilgang, men gjenoppretting feilet: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1762,8 +1762,8 @@ Det er ikke tilrådelig å bruke den.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>klarte ikke å opprette mappe %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1775,8 +1775,8 @@ Det er ikke tilrådelig å bruke den.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Klarte ikke å fjerne mappe '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2513,11 +2513,6 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Suksess.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync klarte ikke å laste eller opprette journalfilen. Sjekk at du har lese- og skrivetilgang i den lokale synkroniseringsmappen.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync kunne ikke laste inn journalfilen. Journalfilen er ødelagt.</translation>
@@ -2588,9 +2583,34 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>CSync feilet pga. at nektet tilgang ikke ble håndtert.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync prøvde å opprette en mappe som finnes allerede.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2608,11 +2628,6 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Avbrutt av brukeren</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Den oppkoblede mappen er for tiden ikke tilgjengelig på serveren</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2623,19 +2638,19 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>CSync klarte ikke å aksessere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Tjenesten er midlertidig utilgjengelig</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Det oppstod en feil ved åpning av en mappe</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Tjenesten er midlertidig utilgjengelig</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2699,21 +2714,6 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Ignorert på grunn av svartelisten "velg hva som skal synkroniseres"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
@@ -2975,6 +2975,11 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -3000,11 +3005,6 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>&Behold lokale data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Hvis det settes kryss i denne boksen, vil eksisterende innhold i den lokale mappen bli slettet for å starte en ren synkronisering fra serveren.</p><p>Ikke sett kryss for dette hvis det lokale innholdet skal lastes opp til mappen på serveren.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>S&ynkroniser alt fra serveren</translation>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 489c691..94d1cb0 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -425,8 +425,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 zou een map moeten zijn, maar is dit niet.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -626,8 +626,8 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Het geselecteerde pad is geen directory!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -774,17 +774,17 @@ Totaal resterende tijd %5</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
<source>Waiting...</source>
- <translation type="unfinished"/>
+ <translation>Aan het wachten...</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
<source>Waiting for %n other folder(s)...</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Wacht op %n andere map...</numerusform><numerusform>Wacht op %n andere mappen...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
<source>Preparing to sync...</source>
- <translation type="unfinished"/>
+ <translation>Voorbereiden op sync...</translation>
</message>
</context>
<context>
@@ -810,8 +810,8 @@ Totaal resterende tijd %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>De directory aliasnaam is een beschrijvende naam voor deze synchronisatieverbinding.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1078,12 +1078,10 @@ account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Bestanden of mappen die overeenkomen met een patroon zullen niet worden gesynchroniseerd.
-
-Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een map verdwijnt. Dit is nuttig voor metadata.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1405,13 +1403,13 @@ vragen om extra autorisaties tijdens installatie.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sync directory '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Waarschuwing:</strong> De lokale map is niet leeg. Maak een keuze!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1758,8 +1756,8 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1771,8 +1769,8 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>kon map %1 niet maken</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1784,8 +1782,8 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Kon directory '%1' niet verwijderen;</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2451,12 +2449,12 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="66"/>
<source>Untrusted Certificate</source>
- <translation type="unfinished"/>
+ <translation>Niet vertrouwd certificaat</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="135"/>
<source>Cannot connect securely to <i>%1</i>:</source>
- <translation type="unfinished"/>
+ <translation>Kan niet beveiligd verbinden met <i>%1</i>:</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="171"/>
@@ -2522,11 +2520,6 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Succes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync kon het journal bestand niet inladen. Het journal bestand is kapot.</translation>
@@ -2597,9 +2590,34 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync probeerde een al bestaande directory aan te maken.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2617,11 +2635,6 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Afgebroken door de gebruiker</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>De gemounte map is tijdelijk niet beschikbaar op de server</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Bestandsnaam bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
@@ -2632,19 +2645,19 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>CSync kreeg geen toegang</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>De dienst is tijdelijk niet beschikbaar</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Er trad een fout op bij het openen van een directory</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Fout bij het lezen van directory.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>De dienst is tijdelijk niet beschikbaar</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2708,21 +2721,6 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Genegeerd vanwege de "wat synchroniseren" zwarte lijst</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2984,6 +2982,11 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Starten &Schone sync (maakt lokale map leeg!)</translation>
@@ -3009,11 +3012,6 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>&Bewaar lokale gegevens</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Als deze checkbox is aangevinkt zullen bestaande bestanden in de lokale map worden gewist om een schone synchronisatie vanaf de server te starten.</p><p>Vink dit niet aan als de lokale bestanden naar de map op de server zouden moeten worden geupload.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>S&ynchroniseer alles vanaf de server</translation>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 3bb9770..625ce0a 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 powinien być katalogiem, ale nie jest.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,8 +624,8 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Zaznaczona ścieżka nie jest katalogiem!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -807,8 +807,8 @@ Pozostało czasu %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Alias katalogu jest nazwą opisową dla tego połączenia synchronizacji.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1396,13 +1396,13 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Synchronizacja katalogu '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Uwaga:</strong> Lokalny katalog nie jest pusty. Wybierz rozważnie!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1749,8 +1749,8 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Plik lub katalog został usunięty z udziału z prawem tylko do odczytu, ale przywrócenie nie powiodło się: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1762,8 +1762,8 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>nie można utworzyć katalogu %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1775,7 +1775,7 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2509,11 +2509,6 @@ Niezalecane jest jego użycie.</translation>
<translation>Sukces.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync nie powiodło się załadowanie lub utworzenie pliku dziennika. Upewnij się, że masz prawa do odczytu i zapisu do lokalnego katalogu synchronizacji.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2584,9 +2579,34 @@ Niezalecane jest jego użycie.</translation>
<translation>CSync nie obsługiwane, odmowa uprawnień.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync próbował utworzyć katalog, który już istnieje.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2604,11 +2624,6 @@ Niezalecane jest jego użycie.</translation>
<translation>Anulowane przez użytkownika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2619,18 +2634,18 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2695,21 +2710,6 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2971,6 +2971,11 @@ Niezalecane jest jego użycie.</translation>
<translation>Serwer</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2996,11 +3001,6 @@ Niezalecane jest jego użycie.</translation>
<translation>&Zachowaj dane lokalne</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Jeśli zaznaczysz, istniejąca zawartość w lokalnym katalogu zostanie wymazana w celu rozpoczęcia czystej synchronizacji z serwerem.</p><p>Nie zaznaczaj, jeśli chcesz aby lokalna zawartość została wysłana do katalogu na serwerze.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 3218504..8b95462 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -4,7 +4,7 @@
<message>
<location filename="../src/libsync/filesystem.cpp" line="227"/>
<source>The destination file has an unexpected size or modification time</source>
- <translation>O ficheiro destino tem um tamanho ou hora de modificação inesperado</translation>
+ <translation>O ficheiro de destino tem um tamanho inesperado ou a hora foi modificada</translation>
</message>
</context>
<context>
@@ -86,7 +86,7 @@
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
<source>Delete</source>
- <translation>Apagar</translation>
+ <translation>Eliminar</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="97"/>
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 devia de ser um directório mas não é</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -518,7 +518,8 @@
<location filename="../src/gui/folder.cpp" line="1106"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
- <translation type="unfinished"/>
+ <translation>Foi adicionada uma nova pasta maior do que %1 MB: %2.
+Por favor, vá às definições para a selecionar, se a desejar transferir.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1119"/>
@@ -623,8 +624,8 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>O caminho selecionado não é uma diretoria!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -770,17 +771,17 @@ Tempo total restante %5</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
<source>Waiting...</source>
- <translation type="unfinished"/>
+ <translation>A aguardar...</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
<source>Waiting for %n other folder(s)...</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>A aguardar por %n outra pasta...</numerusform><numerusform>A aguardar por %n outra(s) pasta(s)...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
<source>Preparing to sync...</source>
- <translation type="unfinished"/>
+ <translation>A preparar para sincronizar...</translation>
</message>
</context>
<context>
@@ -806,8 +807,8 @@ Tempo total restante %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>O pseudónimo do directório é um nome descritivo para esta conexão de sincronização.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1074,7 +1075,7 @@ Conta: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1276,7 +1277,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<location filename="../src/gui/networksettings.ui" line="250"/>
<location filename="../src/gui/networksettings.ui" line="282"/>
<source>Limit to 3/4 of estimated bandwidth</source>
- <translation type="unfinished"/>
+ <translation>Limitar para 3/4 da largura de banda estimatda</translation>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="269"/>
@@ -1399,13 +1400,13 @@ privilégios adicionais durante o processo.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sincronizar a diretoria '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Aviso:</strong> A pasta local não está vazia. Faça a sua escolha!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1751,8 +1752,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Um ficheiro ou um directório foi removido de uma partilha apenas de leitura, mas o restauro falhou: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1764,8 +1765,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>Não foi possível criar a directoria %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1777,8 +1778,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Não foi possível remover o diretório '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2414,7 +2415,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sslbutton.cpp" line="219"/>
<source>No support for SSL session tickets/identifiers</source>
- <translation type="unfinished"/>
+ <translation>Nenhum suporte para tickets/identificadores de sessão SSL</translation>
</message>
<message>
<location filename="../src/gui/sslbutton.cpp" line="230"/>
@@ -2444,12 +2445,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="66"/>
<source>Untrusted Certificate</source>
- <translation type="unfinished"/>
+ <translation>Certificado Não Confiável</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="135"/>
<source>Cannot connect securely to <i>%1</i>:</source>
- <translation type="unfinished"/>
+ <translation>Não é possível ligar com segurança a <i>%1</i>:</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="171"/>
@@ -2515,11 +2516,6 @@ It is not advisable to use it.</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync falhou no carregamento ou criação do ficheiro jornal. Confirme que tem permissões de escrita e leitura no directório de sincronismo local.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync falhou a carregar o ficheiro do jornal. O ficheiro do jornal está corrupto.</translation>
@@ -2590,9 +2586,34 @@ It is not advisable to use it.</source>
<translation>CSync: Erro devido a permissões de negação não tratadas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>O CSync tentou criar uma pasta que já existe.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2610,14 +2631,9 @@ It is not advisable to use it.</source>
<translation>Cancelado pelo utilizador</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>O directório montado está temporariamente indisponível no servidor</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>O nome do ficheiro contém carateres inválidos que não podem ser sincronizados através das plataformas.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="146"/>
@@ -2625,19 +2641,19 @@ It is not advisable to use it.</source>
<translation>CSync falhou o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>O serviço está temporariamente indisponível</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Ocorreu um erro ao abrir um diretório</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Erro durante a leitura da diretoria.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>O serviço está temporariamente indisponível</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2701,21 +2717,6 @@ It is not advisable to use it.</source>
<translation>Ignorado devido à blacklist de escolha para sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2977,6 +2978,11 @@ It is not advisable to use it.</source>
<translation>Servidor</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>&Iniciar uma nova sincronização (Apaga a pasta local)</translation>
@@ -3002,11 +3008,6 @@ It is not advisable to use it.</source>
<translation>&Manter dados locais</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Se esta caixa estiver seleccionada, o conteúdo existente na pasta local será apagado e será iniciada uma nova sincronização a partir dos dados do servidor.</p><p>Não seleccione esta caixa se os dados locais tiverem de ser sincronizados com o servidor.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Sincronizar tudo do servidor</translation>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 920ef6c..3a746e5 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 deveria ser uma pasta, mas não é.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>O caminho selecionado não é para um diretório!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Total de tempo que falta %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>O apelido da pasta é um nome descritivo para esta conexão de sincronização.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1077,12 +1077,10 @@ Conta: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Arquivos ou diretórios que correspondam a um padrão não serão sincronizados.
-
-Itens onde eliminação é permitido serão excluídos se eles impedem que um diretório seja removido. Isso é útil para meta dados.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1404,13 +1402,13 @@ por privilégios adicionais durante o processo.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sincronizar a pasta '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Atenção:</strong> O diretório local não está vazio. Escolha a resolução!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1756,8 +1754,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Um arquivo ou diretório foi removido de um compartilhamento somente de leitura, mas a restauração falhou: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1769,8 +1767,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>Não foi possível criar diretório %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1782,8 +1780,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Não foi possível remover a pasta '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2519,11 +2517,6 @@ It is not advisable to use it.</source>
<translation>Sucesso.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync não conseguiu carregar o arquivo journal. O arquivo journal está corrompido.</translation>
@@ -2594,9 +2587,34 @@ It is not advisable to use it.</source>
<translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync tentou criar um diretório que já existe.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2614,11 +2632,6 @@ It is not advisable to use it.</source>
<translation>Abortado pelo usuário</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>O diretório montado não está temporariamente disponível no servidor</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Nome do arquivo contém caracteres inválidos que não podem ser sincronizados entre plataformas.</translation>
@@ -2629,19 +2642,19 @@ It is not advisable to use it.</source>
<translation>CSync não conseguiu o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>O serviço está temporariamente indisponível</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Ocorreu um erro ao abrir um diretório</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Erro ao ler diretório.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>O serviço está temporariamente indisponível</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2705,21 +2718,6 @@ It is not advisable to use it.</source>
<translation>Ignorado por causa da lista negra "escolher o que sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2981,6 +2979,11 @@ It is not advisable to use it.</source>
<translation>Servidor</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Iniciar uma sincronização &limpa (Elimina a pasta local!)</translation>
@@ -3006,11 +3009,6 @@ It is not advisable to use it.</source>
<translation>&Manter dados locais</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><p><body>Se esta opção estiver marcada, os conteúdos existentes no diretório local serão apagados para iniciar uma sincronização limpa a partir do servidor. </p> Não marque esta opção se o conteúdo local deve ser enviado para o diretório de servidores. </p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>S&ync tudo do servidor</translation>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 300749e..9ff1d00 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 должен быть каталогом, но не является таковым.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>По указанному пути находится не каталог!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Псевдоним каталога - это наглядное имя для этой синхронизации.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Файлы или каталоги, соответствующие шаблонам игнорирования не будут синхронизированы.
-
-Выбранные элементы также будут удалены если они не позволят удалить каталог. Это полезно для метаданных.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1403,13 +1401,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Синхронизация каталога '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Внимание:</strong> Локальный каталог не пуст. Выберите способ решения</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1756,8 +1754,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Файл или каталог был удалён с общего ресурса только для чтения, но его не удалось восстановить: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1769,8 +1767,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>не удалось создать каталог %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1782,8 +1780,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Невозможно удалить каталог '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2524,11 +2522,6 @@ It is not advisable to use it.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync не смог открыть или создать файл журнала. Убедитесь, что у вас достаточно прав для чтения и записи в локальном каталоге синхронизации.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync не удалось загрузить файл журнала. Файл журнала повреждён.</translation>
@@ -2599,9 +2592,34 @@ It is not advisable to use it.</source>
<translation>CSync не работает из-за неожиданного отказа в доступе.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync пытался создать каталог, который уже существует.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2619,11 +2637,6 @@ It is not advisable to use it.</source>
<translation>Прервано пользователем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Присоединённая папка временно не доступна на сервере</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
@@ -2634,19 +2647,19 @@ It is not advisable to use it.</source>
<translation>CSync отказано в доступе</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Сервис временно недоступен</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Произошла ошибка при открытии папки</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Ошибка чтения каталога.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Сервис временно недоступен</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2710,21 +2723,6 @@ It is not advisable to use it.</source>
<translation>Игнорируется из-за черного списка в "что синхронизировать"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Не допускается, так как у вас нет прав для создания подкаталогов в этом каталоге</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Не допускается, так как у вас нет прав для создания родительской папки</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Не допускается, так как у вас нет прав для добавления файлов в этот каталог</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем</translation>
@@ -2986,6 +2984,11 @@ It is not advisable to use it.</source>
<translation>Сервер</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Начать новую синхронизацию (Стирает локальную папку!)</translation>
@@ -3011,11 +3014,6 @@ It is not advisable to use it.</source>
<translation>&Сохранить локальные данные</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Если эта галочка установлена, существующее содержимое в локальном каталоге будет стёрто, чтобы начать чистую синхронизацию с сервером.</p><p>Не ставьте её, если локальное содержимое должно быть загружено на сервер.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Синхронизировать всё с сервером</translation>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 345fb29..6c1be99 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 by mal byť priečinok, avšak nie je.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Celkom zostáva %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Alias priečinka je popisný názov pre toto synchronizačné spojenie.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1396,13 +1396,13 @@ môžu byť vyžadované dodatočné oprávnenia.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Sychronizovať priečinok '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Varovanie:</strong> Lokálny priečinok nie je prázdny. Vyberte riešenie!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1749,8 +1749,8 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Súbor alebo priečinok bol odobratý zo zdieľania len na čítanie, ale jeho obnovenie zlyhalo: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1762,8 +1762,8 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>nepodarilo sa vytvoriť priečinok %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1775,8 +1775,8 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Nemožno odstrániť priečinok '%1'; </translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2515,11 +2515,6 @@ Nie je vhodné ju používať.</translation>
<translation>Úspech.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync sa nepodarilo načítať alebo vytvoriť súbor žurnálu. Uistite sa, že máte oprávnenia na čítanie a zápis v lokálnom synchronizovanom priečinku.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Nepodarilo sa načítanie žurnálovacieho súboru CSync. Súbor je poškodený.</translation>
@@ -2590,9 +2585,34 @@ Nie je vhodné ju používať.</translation>
<translation>CSync zlyhalo. Nedostatočné oprávnenie.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync sa pokúsil vytvoriť priečinok, ktorý už existuje.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2610,11 +2630,6 @@ Nie je vhodné ju používať.</translation>
<translation>Zrušené používateľom</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Pripojený priečinok je na serveri dočasne nedostupný</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2625,19 +2640,19 @@ Nie je vhodné ju používať.</translation>
<translation>Prístup pre CSync zlyhal</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Služba je dočasne nedostupná</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Nastala chyba počas otvárania priečinka.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Služba je dočasne nedostupná</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2701,21 +2716,6 @@ Nie je vhodné ju používať.</translation>
<translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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 priečinka podpriečinky</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <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ý priečinok.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <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 priečinka súbory.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2977,6 +2977,11 @@ Nie je vhodné ju používať.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -3002,11 +3007,6 @@ Nie je vhodné ju používať.</translation>
<translation>&Nechať lokálne dáta</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Pokiaľ je toto pole zaškrtnuté, existujúci obsah lokálneho priečinka bude vymazaný pre začatie čistej synchronizácie zo servera.</p><p>Nezaškrtnite pokiaľ má byť lokálny obsah nahraný do serverového priečinka.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>S&ynchronizovať zo servera všetko</translation>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index f828971..bb652e3 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 bi morala biti mapa, vendar ni.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Skupaj še %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Oznaka mape je opisno ime za usklajevano povezavo.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1396,13 +1396,13 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Uskladi mapo '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Opozorilo:</strong> krajevna mapa ni prazna. Kaj storiti?</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1749,8 +1749,8 @@ Uporaba ni priporočljiva.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Datoteka ali mapa je bila odstranjena iz mesta v souporabi, ki je nastavljeno le za branje, obnavljanje pa je spodletelo: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1762,8 +1762,8 @@ Uporaba ni priporočljiva.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>ni mogoče ustvariti mape %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1775,8 +1775,8 @@ Uporaba ni priporočljiva.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Ni mogoče odstraniti mape '%1'; </translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2509,11 +2509,6 @@ Uporaba ni priporočljiva.</translation>
<translation>Uspešno končano.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2584,9 +2579,34 @@ Uporaba ni priporočljiva.</translation>
<translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>Prišlo je do napake programa CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2604,11 +2624,6 @@ Uporaba ni priporočljiva.</translation>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2619,19 +2634,19 @@ Uporaba ni priporočljiva.</translation>
<translation>Dostop s CSync je spodletel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Storitev trenutno ni na voljo</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Med odpiranjem mape je prišlo do napake.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Napaka med branjem mape</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Storitev trenutno ni na voljo</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2695,21 +2710,6 @@ Uporaba ni priporočljiva.</translation>
<translation>Prezrto, ker ni neizbrano za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Ni ustreznih dovoljenj za dodajanje podmap v izbrano mapo.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Ni ustreznih dovoljenj za dodajanje nadrejene mape.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Ni ustreznih dovoljenj za dodajanje datotek v izbrano mapo.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
@@ -2971,6 +2971,11 @@ Uporaba ni priporočljiva.</translation>
<translation>Strežnik</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2996,11 +3001,6 @@ Uporaba ni priporočljiva.</translation>
<translation>&Ohrani krajevno shranjene podatke</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Izbrana možnost določa, da bo do podatki v krajevni mapi v celoti izbrisani, nato pa bo vsebina te mape usklajena z vsebino na strežniku.</p><p>Če želite datoteke v tej mapi poslati na strežnik, te možnosti NE označite.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Uskladi &vse datoteke s strežnika</translation>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index f49f419..3b16fa6 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 би требало да је директоријум али није.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Алијас директоријума је описно име за ову везу синхронизације.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1396,13 +1396,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Синхронизуј директоријум „%1“</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Упозорење:</strong> Локални директоријум није празан. Изаберите решење!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1749,8 +1749,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Фајл или директоријум је уклоњен из дељења које је само за читање али враћење није успело: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1762,8 +1762,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>не могу да направим директоријум %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1775,8 +1775,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Не могу да уклоним директоријум %1;</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2515,11 +2515,6 @@ It is not advisable to use it.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync није успео да направи фајл дневника. Проверите да ли имате дозволе за читање и писање у локалном директоријуму за синхронизацију.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync не може да учита фајл дневника. Фајл дневника је оштећен.</translation>
@@ -2590,9 +2585,34 @@ It is not advisable to use it.</source>
<translation>CSync није успео јер нема радње услед одбијања дозвола.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync је покушао да направи директоријум који већ постоји.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2610,11 +2630,6 @@ It is not advisable to use it.</source>
<translation>Прекинуо корисник</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Монтирани директоријум тренутно није доступан на серверу</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2625,19 +2640,19 @@ It is not advisable to use it.</source>
<translation>CSync није приступио</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Услуга је привремено недоступна</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Грешка при отварању директоријума</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Услуга је привремено недоступна</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2701,21 +2716,6 @@ It is not advisable to use it.</source>
<translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Није могуће јер немате дозволу да додајете поддиректоријуме у тај директоријум</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Није могуће јер немате дозволу да додајете наддиректоријум</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Није могуће јер немате дозволу да додајете фајлове у тај директоријум</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Није могуће отпремити овај фајл јер је на серверу само за читање. Враћам</translation>
@@ -2977,6 +2977,11 @@ It is not advisable to use it.</source>
<translation>Сервер</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -3002,11 +3007,6 @@ It is not advisable to use it.</source>
<translation>&Остави локалне податке</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Ако је ово поље означено, постојећи садржај локалног директоријума биће обрисан да би започела чиста синхронизација са сервера.</p><p>Не означавајте ако локални садржај треба отпремити у директоријуме на серверу.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Син&хронизуј све са сервера</translation>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 34b75bf..815ddfd 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 ska vara en mapp, men är inte det.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Total tid kvar %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Katalogens alias är ett beskrivande namn för denna synkroniseringsanslutning.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1395,13 +1395,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Varning:</strong> Den lokala mappen är inte tom. Välj en lösning!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1748,8 +1748,8 @@ Det är inte lämpligt använda den.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>En fil eller katalog togs bort från en endast-läsbar delning, men återställning misslyckades: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1761,8 +1761,8 @@ Det är inte lämpligt använda den.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>kunde ej skapa katalogen %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1774,7 +1774,7 @@ Det är inte lämpligt använda den.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2508,11 +2508,6 @@ Det är inte lämpligt använda den.</translation>
<translation>Lyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync misslyckades att skapa en journal fil. Se till att du har läs och skriv rättigheter i den lokala synk katalogen.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2583,9 +2578,34 @@ Det är inte lämpligt använda den.</translation>
<translation>CSYNC misslyckades på grund av att nekad åtkomst inte hanterades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync försökte skapa en mapp som redan finns.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2603,11 +2623,6 @@ Det är inte lämpligt använda den.</translation>
<translation>Avbruten av användare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2618,18 +2633,18 @@ Det är inte lämpligt använda den.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2694,21 +2709,6 @@ Det är inte lämpligt använda den.</translation>
<translation>Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2970,6 +2970,11 @@ Det är inte lämpligt använda den.</translation>
<translation>Server</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2995,11 +3000,6 @@ Det är inte lämpligt använda den.</translation>
<translation>&Behåll lokal data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Om denna ruta är ikryssad så kommer existerande innehåll i den lokala mappen att raderas och en ny synkronisering sker från servern.</p><p>Kryssa inte i denna ruta om data från den lokala mappen ska laddas upp till servern.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 5260011..e59d672 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,8 +624,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>ไม่ได้เลือกเส้นทางของไดเรกทอรี!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -806,8 +806,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>นามแฝงไดเรกทอรีเป็นชื่อที่อธิบายสำหรับเชื่อมต่อการประสานข้อมูลนี้</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1074,12 +1074,10 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>ไฟล์หรือไดเรกทอรีตรงกับรูปแบบจะไม่ถูกประสานข้อมูล
-
-รายการที่ลบจะอนุญาตให้ลบถ้าพวกเขาป้องกันไม่ให้ไดเรกทอรีจากการถูกลบออก นี้จะเป็นประโยชน์สำหรับข้อมูล meta</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1400,13 +1398,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>ประสานข้อมูลไดเรกทอรี '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>คำเตือน:</strong>ไดเรกทอรีต้นทางไม่ว่างเปล่า เลือกความละเอียด!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1753,8 +1751,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>แฟ้มหรือไดเรกทอรีถูกลบออกจากการแชร์เพื่ออ่านเพียงอย่างเดียว แต่การฟื้นฟูล้มเหลว: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1766,8 +1764,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>ไม่สามารถสร้างไดเรกทอรี %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1779,8 +1777,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>ไม่สามารถลบไดเรกทอรี '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2511,11 +2509,6 @@ It is not advisable to use it.</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync ไม่สามารถโหลดหรือสร้างไฟล์เจอร์นัล ให้แน่ใจว่าคุณได้อ่านและเขียนสิทธิ์ในไดเรกทอรีผสานข้อมูลต้นทางแล้ว</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync ไม่สามารถโหลดไฟล์เจอร์นัล ไฟล์เจอร์นัลได้รับความเสียหาย</translation>
@@ -2586,9 +2579,34 @@ It is not advisable to use it.</source>
<translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2606,11 +2624,6 @@ It is not advisable to use it.</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>ไดเรกทอรีที่ติดตั้งชั่วคราวไม่สามารถใช้ได้บนเซิร์ฟเวอร์</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>ชื่อไฟล์มีอักขระที่ไม่ถูกต้องจึงไม่สามารถประสานข้อมูลข้ามแพลตฟอร์ม</translation>
@@ -2621,19 +2634,19 @@ It is not advisable to use it.</source>
<translation>ล้มเหลวในการเข้าถึง CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>ไม่สามารถใช้บริการได้ชั่วคราว</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>เกิดข้อผิดพลาดในขณะที่เปิดไดเรกทอรี</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>ข้อผิดพลาดในขณะที่อ่านไดเรกทอรี</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>ไม่สามารถใช้บริการได้ชั่วคราว</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2697,21 +2710,6 @@ It is not advisable to use it.</source>
<translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>ไม่อนุญาตเพราะคุณไม่ได้รับอนุญาตให้เพิ่มไดเรกทอรีย่อยในไดเรกทอรีนี้</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>ไม่อนุญาตให้เพราะคุณไม่ได้รับอนุญาตให้เพิ่มไดเรกทอรีหลัก</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>ไม่อนุญาตให้เพราะคุณไม่ได้รับอนุญาตให้เพิ่มไฟล์ในไดเรกทอรีนี้</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>ไม่อนุญาตให้อัพโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังฟื้นฟู</translation>
@@ -2973,6 +2971,11 @@ It is not advisable to use it.</source>
<translation>เซิร์ฟเวอร์</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>เริ่มต้นทำความสะอาดการประสานข้อมูล (ลบโฟลเดอร์ในระบบ)</translation>
@@ -2998,11 +3001,6 @@ It is not advisable to use it.</source>
<translation>และเก็บข้อมูลต้นทาง</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>ถ้าติ๊กเลือกกล่องนี้ เนื้อหาที่มีอยู่ในไดเรกทอรีต้นทางจะถูกลบเพื่อเริ่มต้นล้างการประสานข้อมูลจากเซิร์ฟเวอร์</p><p>หากไม่ได้ติ๊กเลือกเนื้อหาต้นทางจะถูกอัพโหลดไปยังไดเรกทอรีของเซิร์ฟเวอร์</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>ผสานข้อมูลทุกอย่างจากเซิร์ฟเวอร์</translation>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 63af399..8fda04c 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 bir dizin olmalı, ancak değil.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -625,8 +625,8 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>Seçilen yol bir klasör değil!</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -808,8 +808,8 @@ Toplam kalan süre: %5</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Dizin sahte adı, bu eşitleme bağlantısı için tanımlayıcı bir addır.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1076,12 +1076,10 @@ Hesap: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>Bir desen ile eşleşen dosyalar veya dizinler eşitlenmeyecektir.
-
-Bir dizinin silinmesine engel oluyorsa silmeye izin verilen yerlerdeki ögeler silinecektir. Bu ham veriler için kullanışlıdır.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="117"/>
@@ -1402,13 +1400,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>'%1' dizinini eşitle</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Uyarı:</strong> Yerel klasör boş değil. Bir çözüm seçin!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1755,8 +1753,8 @@ Kullanmanız önerilmez.</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1768,8 +1766,8 @@ Kullanmanız önerilmez.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>%1 dizini oluşturulamadı</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1781,8 +1779,8 @@ Kullanmanız önerilmez.</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>'%1' dizini silinemiyor;</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2519,11 +2517,6 @@ Kullanmanız önerilmez.</translation>
<translation>Başarılı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync günlük dosyasını yükleyemedi. Günlük dosyası bozuk.</translation>
@@ -2594,9 +2587,34 @@ Kullanmanız önerilmez.</translation>
<translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync, zaten mevcut olan bir dizin oluşturmaya çalıştı.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2614,11 +2632,6 @@ Kullanmanız önerilmez.</translation>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Bağlanan dizin geçici olarak sunucuda kullanılabilir değil</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya adı platformlar arası eşitleme yapılamayacak geçersiz karakterler içeriyor.</translation>
@@ -2629,19 +2642,19 @@ Kullanmanız önerilmez.</translation>
<translation>CSync erişimde başarısız oldu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Hizmet geçiçi olarak kullanılamıyor</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Dizin açılırken bir hata oluştu</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation>Dizin okunurken hata oluştu.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Hizmet geçiçi olarak kullanılamıyor</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2705,21 +2718,6 @@ Kullanmanız önerilmez.</translation>
<translation>"Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <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/libsync/syncengine.cpp" line="997"/>
- <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/libsync/syncengine.cpp" line="1017"/>
<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>
@@ -2981,6 +2979,11 @@ Kullanmanız önerilmez.</translation>
<translation>Sunucu</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation>Temiz bir &eşitleme başlat (Yerel klasörü siler!)</translation>
@@ -3006,11 +3009,6 @@ Kullanmanız önerilmez.</translation>
<translation>&Yerel veriyi sakla</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Eğer bu kutu işaretlenmişse, yerel dizindeki tüm içerik sunucudan temiz bir eşitleme yapılabilmesi için silinecektir.</p><p>Eğer yerel içeriğin sunucu dizininden güncellenmesini istemiyorsanız, bunu işaretlemeyin.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Sunucudaki her şeyi &eşitle</translation>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index f563aab..0d8b828 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 повинна бути текою, але нею не є.</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,7 +624,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -807,8 +807,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>Псевдонім каталогу - наочне ім'я для цієї синхронізації.</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1395,13 +1395,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>Синхронізувати каталог '%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>Увага:</strong> Локальна тека не пуста. Оберіть рішення!</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1748,8 +1748,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>Файл або каталог було видалено з опублікованої теки з правами тільки на перегляд, але відновити його не вдалося: %1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1761,8 +1761,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>Не вдалося створити теку %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1774,8 +1774,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>Неможливо видалити теку '%1';</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2514,11 +2514,6 @@ It is not advisable to use it.</source>
<translation>Успішно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync не зміг завантажити або створити файл протоколу. Перевірте, чи надано права на перегляд та запис до локальної теки.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync не вдалося завантажити файл журналу. Файл журналу пошкоджений.</translation>
@@ -2589,9 +2584,34 @@ It is not advisable to use it.</source>
<translation>CSync завершився неуспішно через порушення прав доступу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync намагалася створити каталог, який вже існує.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2609,11 +2629,6 @@ It is not advisable to use it.</source>
<translation>Перервано користувачем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation>Приєднана тека тимчасово недоступна на сервері</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2624,19 +2639,19 @@ It is not advisable to use it.</source>
<translation>CSync не вдалося отримати доступ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>Служба тимчасово недоступна</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>Виникла помилка під час відкривання теки</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>Служба тимчасово недоступна</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2700,21 +2715,6 @@ It is not advisable to use it.</source>
<translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>Не дозволено через відсутність прав на додавання підкаталогів в цій теці.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>Не дозволено через відсутність прав на додавання батьківської теки.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>Не дозволено через відсутність прав на додавання файлів в цю теку.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо</translation>
@@ -2976,6 +2976,11 @@ It is not advisable to use it.</source>
<translation>Сервер</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -3001,11 +3006,6 @@ It is not advisable to use it.</source>
<translation>&Зберегти локальні дані</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>Якщо встановлено цю позначку, існуючі дані в локальній теці будуть видалені, щоб розпочати чисту синхронізацію з сервером.</p><p>Не ставте її, якщо локальні дані мають бути завантажені на сервер.</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>Синхронізувати все з сервером</translation>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index f2c815d..050cbd5 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>%1 应为目录但并不是。</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -624,8 +624,8 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
- <translation>所选择的路径并非一个目录！</translation>
+ <source>The selected path is not a folder!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1142"/>
@@ -807,8 +807,8 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
- <translation>目录别名</translation>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1071,7 +1071,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1395,13 +1395,13 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
- <translation>同步目录'%1'</translation>
+ <source>Sync the folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation><p><small><strong>警告：</strong> 本地目录非空。选择一个操作！</small></p></translation>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1747,8 +1747,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation>文件（夹）移除了只读共享，但恢复失败：%1</translation>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1760,8 +1760,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>不能创建文件夹 %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1773,8 +1773,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
- <translation>无法删除目录'%1'；</translation>
+ <source>Could not remove folder '%1';</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
@@ -2509,11 +2509,6 @@ It is not advisable to use it.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync同步无法载入日志文件。日志文件已损坏。</translation>
@@ -2584,9 +2579,34 @@ It is not advisable to use it.</source>
<translation>出于未处理的权限拒绝，CSync 失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync 尝试创建了已有的文件夹。</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2604,11 +2624,6 @@ It is not advisable to use it.</source>
<translation>用户撤销</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2619,19 +2634,19 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
- <translation>服务暂时不可用</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
- <translation>打开目录失败</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
+ <translation>服务暂时不可用</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="175"/>
@@ -2695,21 +2710,6 @@ It is not advisable to use it.</source>
<translation>已忽略（“选择同步内容”黑名单）</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation>你没有权限增加子目录</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation>你没有权限增加父目录</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation>你没有权限增加文件</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>无法上传文件，因为服务器端此文件为只读，正在回退</translation>
@@ -2971,6 +2971,11 @@ It is not advisable to use it.</source>
<translation>服务器</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2996,11 +3001,6 @@ It is not advisable to use it.</source>
<translation>保留本地数据 (&K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation><html><head/><body><p>当该选项被勾选，当前目录的内容将被删除，并开始同步服务器内容。</p><p>如果本地内容要被上传到服务器，不要勾选该选项。</p></body></html></translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>同步服务器的所有内容 (&S)</translation>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index d1bcc08..9055a81 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -424,8 +424,8 @@
</message>
<message>
<location filename="../src/gui/folder.cpp" line="171"/>
- <source>%1 should be a directory but is not.</source>
- <translation>資料夾不存在, %1 必須是資料夾</translation>
+ <source>%1 should be a folder but is not.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="174"/>
@@ -622,7 +622,7 @@ Are you sure you want to perform this operation?</source>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
- <source>The selected path is not a directory!</source>
+ <source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
@@ -804,7 +804,7 @@ Total time left %5</source>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
- <source>The directory alias is a descriptive name for this sync connection.</source>
+ <source>The folder alias is a descriptive name for this sync connection.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1068,7 +1068,7 @@ Account: %3
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
- <source>Files or directories matching a pattern will not be synchronized.
+ <source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
@@ -1392,12 +1392,12 @@ for additional privileges during the process.</source>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
- <source>Sync the directory '%1'</source>
+ <source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
- <source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
+ <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1744,7 +1744,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
- <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1757,8 +1757,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
- <source>could not create directory %1</source>
- <translation>無法建立目錄 %1</translation>
+ <source>could not create folder %1</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1770,7 +1770,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove directory '%1';</source>
+ <source>Could not remove folder '%1';</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2502,11 +2502,6 @@ It is not advisable to use it.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="104"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
@@ -2577,9 +2572,34 @@ It is not advisable to use it.</source>
<translation>CSync 失敗，由於未處理的存取被拒。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync 試圖建立一個已經存在的目錄。</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <source>The mounted folder is temporarily not available on the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <source>An error occurred while opening a folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <source>Error while reading folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
+ <source>Not allowed because you don't have permission to add subfolders that folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <source>Not allowed because you don't have permission to add parent folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="997"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="152"/>
@@ -2597,11 +2617,6 @@ It is not advisable to use it.</source>
<translation>使用者中斷</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
- <source>The mounted directory is temporarily not available on the server</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
@@ -2612,18 +2627,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
- <source>An error occurred while opening a directory</source>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
- <source>Error while reading directory.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2688,21 +2703,6 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="984"/>
- <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/libsync/syncengine.cpp" line="990"/>
- <source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="997"/>
- <source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="1017"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
@@ -2964,6 +2964,11 @@ It is not advisable to use it.</source>
<translation>伺服器</translation>
</message>
<message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
<source>Start a &clean sync (Erases the local folder!)</source>
<translation type="unfinished"/>
@@ -2989,11 +2994,6 @@ It is not advisable to use it.</source>
<translation>保留本地資料 (&K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
<source>S&ync everything from server</source>
<translation>從伺服器同步任何東西 (&Y)</translation>
--
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