diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index a576f1b908..900ca6e3d3 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ FormulariDetailed Sync Protocol
-
+ Protocol de sincronització detallat
@@ -1288,12 +1288,12 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ TextLabelTime
-
+ Hora
@@ -1303,7 +1303,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ Carpeta
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ MidaCopy
-
+ Copia
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ fitxerdirectory
-
+ directori
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ S'ha copiat al porta-retallsThe sync protocol has been copied to the clipboard.
-
+ El protocol de sincronització s'ha copiat al porta-retalls.
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index f91b9a5d20..7a15c96ed0 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -1275,117 +1275,122 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
Form
-
+ FormulářDetailed Sync Protocol
-
+ Detailní protokol synchronizace3
-
+ 34
-
+ 4TextLabel
-
+ Textový popisekTime
-
+ ČasFile
-
+ SouborFolder
-
+ SložkaAction
-
+ AkceSize
-
+ VelikostCopy
-
+ KopieSoft Link ignored
-
+ Symbolický odkaz ignorovánSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Symbolické odkazy narušují sémantiku synchronizace.
+Prosím, nepoužívejte je v synchronizovaných adresáříchfile
-
+ soubordirectory
-
+ adresářThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ Položka %1 byla ignorována, jelikož je na klientském seznamu ignorovaných
+nebo název %1 obsahuje znaky nesynchronizovatelné
+v prostředí více platforemItem ignored
-
+ Položka ignorována%1 on ignore list
-
+ %1 na seznamu ignorovanýchThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ Položka %1 byla přeskočena, protože je na seznamu
+ignorovaných jmen klientaInvalid characters
-
+ Neplatné znakyThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ Název %1 obsahuje alespoň jeden neplatný znak, který narušuje
+synchronizaci v prostředí více platforemConflict file.
-
+ Soubor s konfliktem.
@@ -1393,27 +1398,30 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Soubor byl změněn na serveru i na lokálním disku, na základě čehož
+byl vytvořen tzv. soubor s konfliktem. Změny v lokálním souboru budou
+zkopírovány do souboru s konfliktem, přičemž soubor ze serveru bude
+dostupný pod původním názvemCopied to clipboard
-
+ Zkopírováno do schránkyThe sync protocol has been copied to the clipboard.
-
+ Protokol synchronizace byl zkopírován do schránky.Problem: %1
-
+ Problém: %1No more storage space available on server.
-
+ Na serveru již není k dispozici volné místo.
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 976b998d0d..747fc2dc05 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -1087,7 +1087,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
Setup %1 server
-
+ %1 Server einrichten
@@ -1102,7 +1102,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
Update %1 server
-
+ %1 Server aktualisieren
@@ -1268,7 +1268,7 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
%1 folder <i>%1</i> is synced to local folder <i>%2</i>
-
+ %1 Ordner <i>%1</i> ist mit einem lokalen Ordner synchronisiert <i>%2</i>
@@ -1276,117 +1276,122 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
Form
-
+ FormularDetailed Sync Protocol
-
+ Detailliertes Synchronisationsprotokoll3
-
+ 34
-
+ 4TextLabel
-
+ TextfeldTime
-
+ ZeitFile
-
+ DateiFolder
-
+ OrdnerAction
-
+ AktionSize
-
+ GrößeCopy
-
+ KopierenSoft Link ignored
-
+ Symbolische Verknüpfung ignoriertSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Softlinks zerstören die Semantik beim synchronisieren.
+Verwenden Sie daher keine Softlinks in ihrem zu synchronisierenden Ordnern.file
-
+ Dateidirectory
-
+ VerzeichnisThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ Die %1 wurde ignoriert, da sie entweder auf der Ignore-Liste des Klienten steht
+oder der %1 Zeichen enthält, welche nicht über verschiedene Plattformen
+synchronisiert werden könnenItem ignored
-
+ Eintrag ignoriert%1 on ignore list
-
+ %1 auf der IgnorierlisteThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ Die %1 wurde übersprungen, da der Name auf Klienten-Seite
+in eine Ignorierliste eingetragen istInvalid characters
-
+ Ungültige ZeichenThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ Der %1 - Name enthält ein oder mehrere ungültige Zeichen, die das
+synchronisieren in einer plattformübergreifenden Umgebung verhindernConflict file.
-
+ Konfliktdatei.
@@ -1394,27 +1399,27 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Die Datei wurde sowohl auf dem Server als auch im lokalen Repository geändert und verursacht somit einen Konflikt. Die lokalen Änderungen wurden in die Konflikt-Datei kopiert während die Änderungen vom Server in der Datei mit dem Original-Namen zu finden sind.Copied to clipboard
-
+ In die Zwischenablage kopiertThe sync protocol has been copied to the clipboard.
-
+ Das Synchronisierungs-Protokoll wurde in die Zwischenablage kopiert.Problem: %1
-
+ Problem: %1No more storage space available on server.
-
+ Auf dem Server ist kein Speicherplatz mehr vorhanden.
@@ -1432,7 +1437,7 @@ name
Protocol
-
+ Protokoll
@@ -1961,7 +1966,7 @@ name
Enter the URL of the server that you want to connect to (without http or https).
-
+ Bitte tragen Sie die Adresse Ihres Servers ein, zu dem Sie sich verbinden möchten (mit oder ohne http oder https).
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index a63e21e9cb..6c905f94a4 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -1268,57 +1268,57 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ ΦόρμαDetailed Sync Protocol
-
+ Λεπτομερειες προτοκολου συγχρονισμου3
-
+ 34
-
+ 4TextLabel
-
+ TextLabelTime
-
+ ΏραFile
-
+ ΑρχείοFolder
-
+ ΦάκελοςAction
-
+ ΕνέργειαSize
-
+ ΜέγεθοςCopy
-
+ Αντιγραφή
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ αρχείοdirectory
-
+ κατάλογος
@@ -1391,17 +1391,17 @@ name
Copied to clipboard
-
+ Αντιγραφθηκε στο clipboardThe sync protocol has been copied to the clipboard.
-
+ Το προτοκολο αντιγραφθηκε στο clipboard.Problem: %1
-
+ Πρόβλημα: %1
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 14f97ea8bc..2f147a75d0 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -1275,117 +1275,122 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
Form
-
+ FormularioDetailed Sync Protocol
-
+ Protocolo de Sincronización Detallado3
-
+ 34
-
+ 4TextLabel
-
+ Etiqueta de textoTime
-
+ HoraFile
-
+ ArchivoFolder
-
+ CarpetaAction
-
+ AcciónSize
-
+ TamañoCopy
-
+ CopiarSoft Link ignored
-
+ Enlace simbólico ignoradoSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Los enlaces simbólicos rompen el semanticismo de la sincronización.
+Por favor, no los utilice en directorios sincronizadosfile
-
+ archivodirectory
-
+ carpetaThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ %1 fue ignorado por que está en la lista de clientes ignorados
+o el nombre de %1 contiene caracteres no sincronizables
+en un entorno multiplataformaItem ignored
-
+ Elemento ignorado%1 on ignore list
-
+ %1 en la lista de ignoradosThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ %1 fue omitido por que está en la lista de clientes
+con nombre para ignorar.Invalid characters
-
+ Caracteres inválidosThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ El nombre %1 contiene uno o más caracteres inválidos que romperán
+la sincronización en un entorno multiplataformaConflict file.
-
+ Archivo duplicado.
@@ -1393,27 +1398,30 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ El archivo ha cambiado en el servidor y en el repositorio local y como resultado
+se ha creado un archivo llamado conflicto. El cambio local se ha copiado al
+archivo conflicto y el archivo del servidor está disponible con el nombre
+originalCopied to clipboard
-
+ Copiado al portapapelesThe sync protocol has been copied to the clipboard.
-
+ El informe de sincronización fue copiado al portapapeles.Problem: %1
-
+ Problema: %1No more storage space available on server.
-
+ No hay más espacio disponible en el servidor.
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index dc9a7ffde5..b1b91ac2db 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -1269,57 +1269,57 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ FormularioDetailed Sync Protocol
-
+ Protocolo de Sincronización Detallado3
-
+ 34
-
+ 4TextLabel
-
+ EtiquetaDeTextoTime
-
+ HoraFile
-
+ ArchivoFolder
-
+ CarpetaAction
-
+ AcciónSize
-
+ TamañoCopy
-
+ Copiar
@@ -1335,12 +1335,12 @@ Please do not use them in synced directories
file
-
+ archivodirectory
-
+ directorio
@@ -1379,7 +1379,7 @@ syncing in a cross platform environment
Conflict file.
-
+ Archivo duplicado.
@@ -1392,22 +1392,22 @@ name
Copied to clipboard
-
+ Copiado al portapapelesThe sync protocol has been copied to the clipboard.
-
+ El informe de sincronización fue copiado al portapapeles.Problem: %1
-
+ Problema: %1No more storage space available on server.
-
+ No hay más espacio disponible en el servidor.
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index ec425ae573..9557f4d706 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -1275,117 +1275,122 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ VormDetailed Sync Protocol
-
+ Detailne Sync protokoll3
-
+ 34
-
+ 4TextLabel
-
+ TekstisiltTime
-
+ AegFile
-
+ FailFolder
-
+ KaustAction
-
+ TegevusSize
-
+ SuurusCopy
-
+ KopeeriSoft Link ignored
-
+ Soft linki ingnoreeritiSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Softlingid lõhuvad sünkroniseeringu.
+Palun ära kasuta neid sünkroniseeritavates kataloogidesfile
-
+ faildirectory
-
+ kaustThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ Faili %1 ignoreeriti kuna see on märigitud kliendi ignoreeritavate nimekirjas⏎
+või sisaldab %1 faili nimi sümboleid, mida ei saa sünkroniseerida erinevate⏎
+keskkonna platvormide vahel.Item ignored
-
+ Üksust ignoreeriti%1 on ignore list
-
+ %1 on ingoreeritavate nimistusThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ %1 jäeti vahele, kuna see on märgitud kliendi⏎
+ignoreeritavate nimistusInvalid characters
-
+ Sobimatud sümbolidThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ %1 nimi sisaldab ühte või rohkemat sobimatut sümbolit, mis rikub⏎
+sünkroniseeringu erinevate keskkonna platvormide vahel.Conflict file.
-
+ Konfliktne fail.
@@ -1393,27 +1398,29 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Faili on muudetud serveris ning kohalikus repostitiooriumis ning selle
+tulemusel on tekitatud nn konflikt. Kohalik muudatus on kopeeritud
+konflikt-failiks ning serveris asuv fail on saadaval algse nimega.Copied to clipboard
-
+ Kopeeritud lõikepuhvrisseThe sync protocol has been copied to the clipboard.
-
+ Sync protokoll on kopeeritud lõikepuhvrisse.Problem: %1
-
+ Probleem: %1No more storage space available on server.
-
+ Serveris pole rohkem vaba ruumi.
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index a2ecd2549b..57a7597680 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -1273,7 +1273,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Detailed Sync Protocol
-
+ Sinkronizazio Protokolo Zehatza
@@ -1288,12 +1288,12 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ TestuEtiketaTime
-
+ Noiz
@@ -1303,7 +1303,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ Karpeta
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ TamainaCopy
-
+ Kopiatu
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ fitxategiadirectory
-
+ direktorioa
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ Arbelera kopiatuaThe sync protocol has been copied to the clipboard.
-
+ Sinkronizazio protokoloa arbelera kopiatu da.
@@ -1727,7 +1727,7 @@ name
TextLabel
-
+ TestuEtiketa
@@ -1796,7 +1796,7 @@ name
TextLabel
-
+ TestuEtiketa
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index cfaed6d2d7..66cae044c6 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ فرمDetailed Sync Protocol
-
+ پروتکل تفصیلی همگام سازی
@@ -1288,12 +1288,12 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ برچسب متنیTime
-
+ زمان
@@ -1303,7 +1303,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ پوشه
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ اندازهCopy
-
+ کپی کردن
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ پروندهdirectory
-
+ پوشه
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ کپی به کلیپ بوردThe sync protocol has been copied to the clipboard.
-
+ پروتکل سنکرون شده است به کلیپ بورد کپی شده است.
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index a320a06f83..b57af874bb 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -1268,7 +1268,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ Lomake
@@ -1278,42 +1278,42 @@ Checked items will also be deleted if they prevent a directory from being remove
3
-
+ 34
-
+ 4TextLabel
-
+ TekstiLeimaTime
-
+ AikaFile
-
+ TiedostoFolder
-
+ KansioAction
-
+ ToimintoSize
-
+ Koko
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ tiedostodirectory
-
+ kansio
@@ -1367,7 +1367,7 @@ list of names to ignore
Invalid characters
-
+ Virheellisiä merkkejä
@@ -1391,7 +1391,7 @@ name
Copied to clipboard
-
+ Kopioitu leikepöydälle
@@ -1401,12 +1401,12 @@ name
Problem: %1
-
+ Ongelma: %1No more storage space available on server.
-
+ Palvelimella ei ole enää tallennustilaa käytettävissä.
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 5d51e8036e..cdf9ec000c 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -1086,7 +1086,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
Setup %1 server
-
+ Configurer le serveur %1
@@ -1101,7 +1101,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
Update %1 server
-
+ Mettre à jour le serveur %1
@@ -1267,7 +1267,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
%1 folder <i>%1</i> is synced to local folder <i>%2</i>
-
+ %1 le dossier <i>%1</i> est synchronisé au dossier local <i>%2</i>
@@ -1275,117 +1275,122 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
Form
-
+ FormulaireDetailed Sync Protocol
-
+ Protocole de synchronisation détaillé3
-
+ 34
-
+ 4TextLabel
-
+ Zone de texteTime
-
+ HeureFile
-
+ FichierFolder
-
+ DossierAction
-
+ ActionSize
-
+ TailleCopy
-
+ CopierSoft Link ignored
-
+ Lien symbolique ignoréSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Les liens symboliques cassent la sémantique de la synchronisation.
+Veuillez ne pas les utiliser dans les dossiers synchronisés.file
-
+ fichierdirectory
-
+ dossierThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ Le %1 a été ignoré car il est présent dans la liste des clients à ignorer
+ou le nom de %1 contient des caractères qui ne sont pas synchronisables
+dans un environnement multi-plateformeItem ignored
-
+ Item ignoré%1 on ignore list
-
+ %1 dans la liste à ignorerThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ Le %1 a été ignoré car il est présent dans la liste des
+noms de clients à ignorerInvalid characters
-
+ Caractères invalidesThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ Le nom de %1 contient un ou plusieurs caractères invalides qui ne
+sont pas synchronisables dans un environnement multi-plateformeConflict file.
-
+ Fichier de conflits
@@ -1393,27 +1398,29 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Le fichier a été modifié sur le serveur mais également sur le dépôt local
+ce qui crée un conflit. La modification locale est copiée dans le fichier de
+conflits et le fichier côté serveur est disponible sous son nom original.Copied to clipboard
-
+ Copié dans le presse-papiersThe sync protocol has been copied to the clipboard.
-
+ Le protocole synchronisation choisi a été copié dans le presse-papiers.Problem: %1
-
+ Problème : %1No more storage space available on server.
-
+ Plus aucun espace de stockage n'est disponible sur le serveur.
@@ -1431,7 +1438,7 @@ name
Protocol
-
+ Protocole
@@ -1960,7 +1967,7 @@ name
Enter the URL of the server that you want to connect to (without http or https).
-
+ Saisissez l'URL du serveur auquel vous souhaitez vous connecter (sans http ni https).
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 64e07e6276..a1275f7120 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -1086,7 +1086,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
Setup %1 server
-
+ Estabelecer o servidor %1
@@ -1101,7 +1101,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
Update %1 server
-
+ Actualizar o servidor %1
@@ -1267,7 +1267,7 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
%1 folder <i>%1</i> is synced to local folder <i>%2</i>
-
+ O cartafol %1 <i>%1</i> está sincronizado co cartafol local <i>%2</i>
@@ -1275,117 +1275,122 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
Form
-
+ FormularioDetailed Sync Protocol
-
+ Protocolo de sincronización detallado3
-
+ 34
-
+ 4TextLabel
-
+ Etiqueta de textoTime
-
+ HoraFile
-
+ FicheiroFolder
-
+ CartafolAction
-
+ AcciónSize
-
+ TamañoCopy
-
+ CopiarSoft Link ignored
-
+ Ligazón branda ignoradaSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ As ligazóns brandas rachan a semántica de sincronización.
+Non as use en directorios sincronizados.file
-
+ ficheirodirectory
-
+ directorioThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ O ficheiro foi ignorado porque aparece na lista de ignorados nos
+clientes ou porque o nome %1 contén caracteres que non son
+sincronizábeis nun entorno multiplataforma.Item ignored
-
+ Elemento ignorado%1 on ignore list
-
+ %1 está na lista de ignoradosThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ O %1 foi omitido xa que está na lista de nomes que
+ignorar nos clientesInvalid characters
-
+ Caracteres incorrectosThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ O nome %1 conten un ou máis caracteres incorrectos porque rachan
+a sincronización ene entornos multiplataformaConflict file.
-
+ Ficheiro de conflitos.
@@ -1393,27 +1398,30 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ O ficheiro foi cambiado no servidor e no repositorio local e como resultado
+crease o que se chama un conflito. O cambio local copiase no ficheiro de
+conflitos, mentres que o ficheiro do lado do servidor está dispoñíbel baixo
+o nome orixinalCopied to clipboard
-
+ Copiado no portapapeis.The sync protocol has been copied to the clipboard.
-
+ O protocolo de sincronización foi copiado no portapapeis.Problem: %1
-
+ Problema: %1No more storage space available on server.
-
+ Non hai máis espazo de almacenamento dispoñíbel no servidor.
@@ -1431,7 +1439,7 @@ name
Protocol
-
+ Protocolo
@@ -1960,7 +1968,7 @@ name
Enter the URL of the server that you want to connect to (without http or https).
-
+ Introduza o URL do servidor se quere conectarte a (sen o http ou https).
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 90ff728f63..0bf7aabcd2 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ ŰrlapDetailed Sync Protocol
-
+ Szinkronizációs protokoll bővebben
@@ -1288,37 +1288,37 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ TextLabelTime
-
+ IdőFile
-
+ FájlFolder
-
+ MappaAction
-
+ MűveletSize
-
+ MéretCopy
-
+ Másolás
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ fájldirectory
-
+ mappa
@@ -1391,17 +1391,17 @@ name
Copied to clipboard
-
+ Bemásolva a vágólapraThe sync protocol has been copied to the clipboard.
-
+ A sync protokoll bemásolva a vágólapra.Problem: %1
-
+ Probléma: %1
@@ -1727,7 +1727,7 @@ name
TextLabel
-
+ TextLabel
@@ -1796,7 +1796,7 @@ name
TextLabel
-
+ TextLabel
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index b71ee625cb..ac6f29c157 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -1086,7 +1086,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
Setup %1 server
-
+ Configura il server %1
@@ -1101,7 +1101,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
Update %1 server
-
+ Aggiorna il server %1
@@ -1275,117 +1275,122 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
Form
-
+ ModuloDetailed Sync Protocol
-
+ Protocollo di sincronizzazione dettagliato3
-
+ 34
-
+ 4TextLabel
-
+ EtichettaTestoTime
-
+ OraFile
-
+ FileFolder
-
+ CartellaAction
-
+ AzioneSize
-
+ DimensioneCopy
-
+ CopiaSoft Link ignored
-
+ Collegamento ignoratoSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ I collegamenti rovinano la semantica di sincronizzazione.
+Non utilizzarli nelle cartelle sincronizzatefile
-
+ filedirectory
-
+ cartellaThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ %1 è stato ignorato perché è presente nell'elenco dei nomi da ignorare dei client
+oppure il nome di %1 contiene caratteri non sono sincronizzabili
+in un ambiente multipiattaformaItem ignored
-
+ Elemento ignorato%1 on ignore list
-
+ %1 nell'elenco ignoratiThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ %1 è stato omesso perché è presente nell'elenco dei client dei nomi
+da ignorareInvalid characters
-
+ Caratteri non validiThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ Il nome %1 contiene uno o più caratteri non validi che rovinano
+la sincronizzazione in un ambiente multipiattaformaConflict file.
-
+ File in conflitto.
@@ -1393,27 +1398,29 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Il file è stato modificato sul server e sul deposito locale e ciò genera
+un cosiddetto conflitto. La modifica locale viene copiata sul file in
+conflitto, mentre il file sul server è disponibile con il nome originaleCopied to clipboard
-
+ Copiato negli appuntiThe sync protocol has been copied to the clipboard.
-
+ Il protocollo di sincronizzazione è stato copiato negli appunti.Problem: %1
-
+ Problema: %1No more storage space available on server.
-
+ Spazio di archiviazione insufficiente sul server.
@@ -1431,7 +1438,7 @@ name
Protocol
-
+ Protocollo
@@ -1960,7 +1967,7 @@ name
Enter the URL of the server that you want to connect to (without http or https).
-
+ Digita l'URL del server al quale vuoi collegarti (senza http o https).
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 0d90ed73d6..252e6e2dd9 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -1276,117 +1276,119 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ フォームDetailed Sync Protocol
-
+ 同期状況詳細3
-
+ 34
-
+ 4TextLabel
-
+ テキストラベルTime
-
+ 時刻File
-
+ ファイルFolder
-
+ フォルダAction
-
+ アクションSize
-
+ サイズCopy
-
+ コピーSoft Link ignored
-
+ ソフトリンクは無視されましたSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ ソフトリンクは同期の意味を破壊します。
+同期するディレクトリではそれらを使用しないでください。file
-
+ ファイルdirectory
-
+ ディレクトリThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ クライアントの無視リストに記載されているか、%1の名前にクロスプラットフォーム環境で同期できない文字が含まれているために、%1は無視されました。Item ignored
-
+ アイテムは無視されました%1 on ignore list
-
+ 無視リスト上の%1The %1 was skipped because it is listed on the clients
list of names to ignore
-
+ 無視するクライアントの名前リストに記載されているために、%1はスキップされました。Invalid characters
-
+ 無効な文字The %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ %1の名前に、クロスプラットフォーム環境での同期を破壊する
+無効な文字が1つ以上含まれています。Conflict file.
-
+ 競合ファイル
@@ -1394,27 +1396,27 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ サーバー側とローカル側のファイルが変更された為、競合ファイルが作成されました。ローカル側の変更は、競合Conflictファイルへコピーされ、サーバー側のファイルは、元々のファイル名で利用できます。Copied to clipboard
-
+ クリップボードにコピーThe sync protocol has been copied to the clipboard.
-
+ 同期状況をクリップボードにコピーしましたProblem: %1
-
+ 不具合: %1No more storage space available on server.
-
+ サーバー上で利用可能なストレージ容量が足りません。
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index d1973a2759..029348d553 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -37,7 +37,7 @@
Add Folder
- Voeg Map Toe
+ Voeg map toe
@@ -1086,7 +1086,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
Setup %1 server
-
+ Instellen %1 server
@@ -1101,7 +1101,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
Update %1 server
-
+ Bijwerken %1 server
@@ -1267,7 +1267,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
%1 folder <i>%1</i> is synced to local folder <i>%2</i>
-
+ %1 map <i>%1</i> is gesynchroniseerd met lokale map <i>%2</i>
@@ -1275,117 +1275,123 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
Form
-
+ FormulierDetailed Sync Protocol
-
+ Gedetailleerde synchronisatiehistorie3
-
+ 34
-
+ 4TextLabel
-
+ TekstlabelTime
-
+ TijdFile
-
+ BestandFolder
-
+ MapAction
-
+ HandelingSize
-
+ GrootteCopy
-
+ KopiërenSoft Link ignored
-
+ Soft link overgeslagenSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Softlinks verbreken de semantiek van synchronisatie.
+Gebruik deze niet in gesynchroniseerde mappen.file
-
+ bestanddirectory
-
+ directoryThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ De %1 is genegeerd omdat deze is opgenomen op de lijst van
+te negeren bestanden of doordat de naam %1 karakters bevat
+die niet gesynchroniseerd kunnen worden van het ene naar
+het andere platformItem ignored
-
+ Bestand overgeslagen%1 on ignore list
-
+ %1 op de lijst met genegeerde bestandenThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ De %1 is overgeslagen omdat de lijst met te negeren
+namen staatInvalid characters
-
+ Ongeldige karaktersThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ De naam %1 bevat één of meer ongeldige karakters waardoor
+de synchronsatie van het ene naar het andere platform mislukt.Conflict file.
-
+ Conflicterend bestand.
@@ -1393,27 +1399,30 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Het bestand is gewijzigd zowel op de server en als in de lokale opslag⏎
+met als resultaat een zogenaamd conflict. De lokale wijziging is⏎
+gekopieerd naar het conflicterende bestand, terwijl het bestand dat⏎
+op de server staat beschikbaar blijft met de originele naam.Copied to clipboard
-
+ Gekopieerd naar het klembordThe sync protocol has been copied to the clipboard.
-
+ De synchronisatiegeschiedenis is naar het klembord gekopieerd.Problem: %1
-
+ Probleem: %1No more storage space available on server.
-
+ Geen opslagruimte meer beschikbaar op de server.
@@ -1431,7 +1440,7 @@ name
Protocol
-
+ Protocol
@@ -1960,7 +1969,7 @@ name
Enter the URL of the server that you want to connect to (without http or https).
-
+ Voer de URL in van de server waarmee u wilt verbinden (zonder http of https).
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 811826c8b5..f4d3e7417f 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -1268,62 +1268,62 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ FormularzDetailed Sync Protocol
-
+ Szczegółowy protokół synchronizacji3
-
+ 34
-
+ 4TextLabel
-
+ EtykietaTime
-
+ CzasFile
-
+ PlikFolder
-
+ FolderAction
-
+ AkcjaSize
-
+ RozmiarCopy
-
+ KopiujSoft Link ignored
-
+ Linki symboliczne ignorowane
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ plikdirectory
-
+ Katalog
@@ -1351,12 +1351,12 @@ in a cross platform environment
Item ignored
-
+ Element zignorowany%1 on ignore list
-
+ %1 na zignorowanej liście
@@ -1367,7 +1367,7 @@ list of names to ignore
Invalid characters
-
+ Nieprawidłowe znaki
@@ -1378,7 +1378,7 @@ syncing in a cross platform environment
Conflict file.
-
+ Konflikt pliku.
@@ -1391,22 +1391,22 @@ name
Copied to clipboard
-
+ Skopiuj do schowkaThe sync protocol has been copied to the clipboard.
-
+ Protokół synchronizacji został skopiowany do schowka.Problem: %1
-
+ Problem: %1No more storage space available on server.
-
+ Brak wolnego miejsca na serwerze.
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 6d2889646a..2bbac3b507 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -1269,12 +1269,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ FormulárioDetailed Sync Protocol
-
+ Detalhes do protocolo de sincronização
@@ -1289,12 +1289,12 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ TextLabelTime
-
+ Tempo
@@ -1304,7 +1304,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ Pasta
@@ -1314,12 +1314,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ TamanhoCopy
-
+ Copiar
@@ -1335,12 +1335,12 @@ Please do not use them in synced directories
file
-
+ ficheirodirectory
-
+ diretório
@@ -1392,12 +1392,12 @@ name
Copied to clipboard
-
+ Copiado para a área de transferênciaThe sync protocol has been copied to the clipboard.
-
+ O protocolo de sincronização foi copiado para a área de transferência
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index afbdd8df57..28956c213b 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -1085,7 +1085,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
Setup %1 server
-
+ Configurar servidor %1
@@ -1100,7 +1100,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
Update %1 server
-
+ Atualizar servidor %1
@@ -1266,7 +1266,7 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
%1 folder <i>%1</i> is synced to local folder <i>%2</i>
-
+ %1 pasta <i>%1</i> está sincronizada com a pasta local <i>%2</i>
@@ -1274,117 +1274,122 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
Form
-
+ FormulárioDetailed Sync Protocol
-
+ Protocolo de Sincronização Detalhado3
-
+ 34
-
+ 4TextLabel
-
+ TextLabelTime
-
+ TempoFile
-
+ ArquivoFolder
-
+ PastaAction
-
+ AçãoSize
-
+ TamanhoCopy
-
+ CopiarSoft Link ignored
-
+ Soft Link ignorado.Softlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Softlinks quebra a semântica de sincronização.
+Por favor, não usá-los em diretórios sincronizados.file
-
+ arquivodirectory
-
+ diretórioThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ O %1 foi ignorado porque ele está listado nos clientes
+ignorar a lista ou o nome do %1 contém
+caracteres que não são sincronizáveis em um ambiente multi-plataforma.Item ignored
-
+ Ítem ignorado%1 on ignore list
-
+ %1 na lista ignorarThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ O %1 foi ignorado porque ele está listada na lista de clientes
+lista de nomes para ignorarInvalid characters
-
+ Caracteres inválidosThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ O nome %1 contém um ou mais caracteres inválidos que quebram
+a sincronização em um ambiente muiti-plataformaConflict file.
-
+ Arquivo de conflito.
@@ -1392,27 +1397,29 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ O arquivo foi alterado no repositório do servidor e local, e, como resultado,
+foi criado um chamado conflito. A mudança de local foi copiado para o arquivo de conflito
+enquanto o arquivo do lado do servidor está disponível sob o nome originalCopied to clipboard
-
+ Copiado para área de transferênciaThe sync protocol has been copied to the clipboard.
-
+ O protocolo de sincronização foi copiado para a área de transferência.Problem: %1
-
+ Problema: %1No more storage space available on server.
-
+ Não existe mais espaço disponível para armazenamento no servidor.
@@ -1430,7 +1437,7 @@ name
Protocol
-
+ Protocolo
@@ -1959,7 +1966,7 @@ name
Enter the URL of the server that you want to connect to (without http or https).
-
+ Entrar a URL do servidor que você quer se conectar(sem http ou https)
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 5acca0f458..8057b2b068 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -1275,117 +1275,123 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ ФормаDetailed Sync Protocol
-
+ Подробная информация о протоколе3
-
+ 34
-
+ 4TextLabel
-
+ TextLabelTime
-
+ ВремяFile
-
+ ФайлFolder
-
+ ПапкаAction
-
+ ДействиеSize
-
+ РазмерCopy
-
+ КопироватьSoft Link ignored
-
+ Символическая ссылка проигнорированаSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Символические ссылки могут нарушить процесс синхронизации.
+Пожалуйста не используйте их в синхронизируемых директорияхfile
-
+ файлdirectory
-
+ директорияThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ Пропускаем %1 так как он присутствует в списке
+игнорируемых имён на клиенте или название %1
+содержит символы, нарушающие процесс
+синхронизации между платформамиItem ignored
-
+ Объект проигнорирован%1 on ignore list
-
+ %1 в списке игнорируемыхThe %1 was skipped because it is listed on the clients
list of names to ignore
-
+ Пропускаем %1 так как он присутствует в списке
+игнорируемых имён на клиентеInvalid characters
-
+ Недопустимые символыThe %1 name contains one or more invalid characters which break
syncing in a cross platform environment
-
+ Название %1 содержит один или более недопустимых символов
+которые нарушают процесс синхронизации между платформамиConflict file.
-
+ Конфликт файлов.
@@ -1393,27 +1399,30 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Файл был изменён на сервере и в локальном репозитории и в результате
+был создан так называемый конфликт. Локальные изменения сохранены
+в конфликтный файл, в то время как файл с сервера доступен под
+оригинальным названиемCopied to clipboard
-
+ Скопировано в буфер обменаThe sync protocol has been copied to the clipboard.
-
+ Протокол синхронизации скопирован в буфер обменаProblem: %1
-
+ Проблема: %1No more storage space available on server.
-
+ На сервере нет места для хранения информации.
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 07b922d6a5..fb224fe9bd 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -1275,57 +1275,57 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
Form
-
+ FormulárDetailed Sync Protocol
-
+ Detailný záznam synchronizácie3
-
+ 34
-
+ 4TextLabel
-
+ TextLabelTime
-
+ ČasFile
-
+ SúborFolder
-
+ PriečinokAction
-
+ AkciaSize
-
+ VeľkosťCopy
-
+ Kopírovať
@@ -1341,12 +1341,12 @@ Please do not use them in synced directories
file
-
+ súbordirectory
-
+ priečinok
@@ -1385,7 +1385,7 @@ syncing in a cross platform environment
Conflict file.
-
+ Konfliktný súbor.
@@ -1393,27 +1393,29 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Súbor bol pozmenený na serveri a lokálnom repozitári, čoho výsledkom bolo
+vytvorenie takzvaného konfliktu. Lokálna zmena je kopírovaná do konfliktného
+súboru, pokým súbor zo strany servera je dostupný z originálnym názvomCopied to clipboard
-
+ Skopírované do "clipboard"The sync protocol has been copied to the clipboard.
-
+ Záznam synchronizácie bol skopírovaný do "clipboard".Problem: %1
-
+ Problém: %1No more storage space available on server.
-
+ Nedostatok diskovej kapacity na serveri.
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 95ea0024c5..b9d5af6676 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ ObrazecDetailed Sync Protocol
-
+ Podroben protokol CSync
@@ -1288,22 +1288,22 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ Besedilna oznakaTime
-
+ ČasFile
-
+ DatotekaFolder
-
+ Mapa
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ VelikostCopy
-
+ Kopiraj
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ datotekadirectory
-
+ direktorij
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ Kopirano v odložiščeThe sync protocol has been copied to the clipboard.
-
+ Protokol usklajevanja je kopiran v odložišče.
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 6462c038a1..c4c6c860ac 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -1274,85 +1274,88 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
Form
-
+ FormDetailed Sync Protocol
-
+ Detaljerat Synkprotokoll3
-
+ 34
-
+ 4TextLabel
-
+ TextetikettTime
-
+ TidFile
-
+ FilFolder
-
+ MappAction
-
+ ÅgärdSize
-
+ StorlekCopy
-
+ KopieraSoft Link ignored
-
+ Mjuk länk ignoreradSoftlinks break the semantics of synchronization.
Please do not use them in synced directories
-
+ Mjuka länkar bryter semantiken för synkronisering.⏎
+Använd dem inte i synkade mappar.file
-
+ fildirectory
-
+ mappThe %1 was ignored because it is listed in the clients ignore list
or the %1 name contains characters that are not syncable
in a cross platform environment
-
+ %1 har ignorerats eftersom det finns i klientens ignoreringslista⏎
+eller att namnet %1 innehåller bokstäver som inte är synkbara⏎
+i en plattformsoberoende miljö.
@@ -1373,7 +1376,7 @@ list of names to ignore
Invalid characters
-
+ Ogiltiga tecken
@@ -1384,7 +1387,7 @@ syncing in a cross platform environment
Conflict file.
-
+ Konfliktfil.
@@ -1392,27 +1395,29 @@ syncing in a cross platform environment
created a so called conflict. The local change is copied to the conflict
file while the file from the server side is available under the original
name
-
+ Filen ändrades både på servern och lokalt vilket har skapat en
+så kallad konflikt. Den lokala förändringen kopieras till konfliktfilen
+medan filen från serversidan är tillgänglig under originalnamnetCopied to clipboard
-
+ Kopierat till urklippThe sync protocol has been copied to the clipboard.
-
+ Synkprotokollet har kopierats till urklipp.Problem: %1
-
+ Problem: %1No more storage space available on server.
-
+ Det finns inte tillräckligt med lagringsutrymme tillgängligt på servern.
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index a785fc0f86..8fdd882636 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ แบบฟอร์มDetailed Sync Protocol
-
+ โปรโตคอลที่ใช้ในการผสานข้อมูลโดยละเอียด
@@ -1288,7 +1288,7 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ ป้ายข้อความ
@@ -1303,7 +1303,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ แฟ้มเอกสาร
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ ขนาดCopy
-
+ คัดลอก
@@ -1334,7 +1334,7 @@ Please do not use them in synced directories
file
-
+ ไฟล์
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index c48fbf8059..39492cde79 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ ФормаDetailed Sync Protocol
-
+ Докладний Протокол Синхронізації
@@ -1288,12 +1288,12 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ МіткаTime
-
+ Час
@@ -1303,7 +1303,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ Тека
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ РозмірCopy
-
+ Копіювати
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ файлdirectory
-
+ каталог
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ Скопійовано в буфер обмінуThe sync protocol has been copied to the clipboard.
-
+ Протокол синхронізації був скопійований в буфер обміну.
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 15ad338ccd..78aed0de64 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ 窗体Detailed Sync Protocol
-
+ 详细同步协议
@@ -1288,22 +1288,22 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ 文本标签Time
-
+ 时间File
-
+ 文件Folder
-
+ 文件夹
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ 大小Copy
-
+ 复制
@@ -1334,7 +1334,7 @@ Please do not use them in synced directories
file
-
+ 文件
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ 复制到剪贴板The sync protocol has been copied to the clipboard.
-
+ 同步协议已经复制到剪贴板。
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index a4183de8b6..36e090856a 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -1268,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Form
-
+ 格式Detailed Sync Protocol
-
+ 同步協定細節
@@ -1288,12 +1288,12 @@ Checked items will also be deleted if they prevent a directory from being remove
TextLabel
-
+ 文字標籤Time
-
+ 時間
@@ -1303,7 +1303,7 @@ Checked items will also be deleted if they prevent a directory from being remove
Folder
-
+ 資料夾
@@ -1313,12 +1313,12 @@ Checked items will also be deleted if they prevent a directory from being remove
Size
-
+ 大小Copy
-
+ 複製
@@ -1334,12 +1334,12 @@ Please do not use them in synced directories
file
-
+ 檔案directory
-
+ 目錄
@@ -1391,12 +1391,12 @@ name
Copied to clipboard
-
+ 複製至剪貼簿中The sync protocol has been copied to the clipboard.
-
+ 同步協定已複製至剪貼簿