diff options
| author | Nextcloud bot <bot@nextcloud.com> | 2021-07-10 07:05:37 +0300 |
|---|---|---|
| committer | Nextcloud bot <bot@nextcloud.com> | 2021-07-10 07:05:37 +0300 |
| commit | d15a06cc17c67f04856a1d1ef151535ab90213b7 (patch) | |
| tree | 67270a19636534b03346fe0ea23900ea0a2e5da6 /translations | |
| parent | 61cd132c536471306b5990ff8c4b7d81e9cbd403 (diff) | |
[tx-robot] updated from transifex
Diffstat (limited to 'translations')
56 files changed, 169 insertions, 169 deletions
diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 9a8625454..5cf6a4288 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -3138,17 +3138,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>сървърът е отчел не % 1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_br.ts b/translations/client_br.ts index 344574e15..b79bdcddf 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -3114,17 +3114,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 92b279823..4aae623c1 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -3103,17 +3103,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 9530cdaad..129e58d02 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -3136,17 +3136,17 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>server nahlásil žádné %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt při nahrávání některých souborů do složky. Ty, které jsou v konfliktu budou vymazány!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt při nahrávání složky. Bude vymazána!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt při nahrávání souboru. Bude odebrán!</translation> </message> diff --git a/translations/client_da.ts b/translations/client_da.ts index b16fb155c..99c6f602a 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -3118,17 +3118,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index c513f48b6..a763a9e81 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -3136,17 +3136,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Server meldet kein %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt beim Hochladen einiger Dateien in einen Ordner. Diejenigen, die in Konflikt stehen, werden gelöscht!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt beim Hochladen eines Ordners. Er wird gelöscht!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt beim Hochladen einer Datei. Sie wird entfernt!</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 5c636d2a3..ef3fb6c83 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -3117,17 +3117,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ο διακομιστής δεν ανέφερε %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index ea57c0551..b74238a2d 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -3105,17 +3105,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 6ffc6be84..78cedacc3 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -3111,17 +3111,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index d3b6d7446..5853e8412 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -3137,17 +3137,17 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>el servidor informó de no %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Se ha producido un conflicto al subir algunos archivos a una carpeta. ¡Se eliminarán los conflictivos!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Se ha producido un conflicto al subir una carpeta. ¡Se eliminará!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Se ha producido un conflicto al subir un archivo. ¡Se eliminará!</translation> </message> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index f5591bc2c..95277f664 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -3092,17 +3092,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 44324ece2..2eb11f5d8 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 18bf3211b..2a82fca5c 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 602d93ad9..4337ba408 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 02070ec7c..64deb63c2 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 7de9d761b..bdc6216af 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 3e0d51112..5256c1b42 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 32a6614d1..baa07de8e 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 874c383d7..451e4e807 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 3a79e40b4..87a7223c9 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index 3f4e146ab..24e80fdac 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -3092,17 +3092,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 374e89890..29d8685b5 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -3137,17 +3137,17 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>zerbitzariak ez du %1-rik jakinarazi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Gatazka gertatu da karpeta kargatzean. Garbituko da!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Gatazka gertatu da fitxategia kargatzean. Garbituko da!</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 2fa3af5ec..cad578b2b 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -3096,17 +3096,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 03be2868b..f659696e3 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -3100,17 +3100,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 3ed621f57..9b1fc0e4f 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -3130,17 +3130,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 066f43e93..15a17cbcd 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -3137,17 +3137,17 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>o servidor non informou de %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index 840a022cb..3d7174efc 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -3101,17 +3101,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 9bf07c9f6..16e0c33c8 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -3137,17 +3137,17 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>poslužitelj javlja da nema %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index c62171de0..7ff2af45e 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -3135,17 +3135,17 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze <translation>szerver nem jelentett %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_id.ts b/translations/client_id.ts index 2cfe96ea6..a0481e35f 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -3104,17 +3104,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_is.ts b/translations/client_is.ts index be1a60f23..515c41eb9 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -3108,17 +3108,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 2136ea8c6..07777a286 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -365,7 +365,7 @@ Attendi la nuova sincronizzazione, quindi cifrala.</translation> <message> <location filename="../src/gui/accountsettings.cpp" line="354"/> <source>Encryption failed</source> - <translation type="unfinished"/> + <translation>Cifratura fallita</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="354"/> @@ -3127,17 +3127,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>il server non ha restituito alcun %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 672f8e5dd..7232b76fa 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -3133,17 +3133,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>サーバーから no %1 と通知がありました</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index dc1da8951..0fd1d8a00 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -3141,17 +3141,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>서버가 %1이(가) 없다고(아니라고) 보고함</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 3b86f6ba4..7077f839c 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -3113,17 +3113,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 0f7ddddb3..663dd7bb6 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -3094,17 +3094,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 80762d846..7776921cb 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -3103,17 +3103,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index ae23ef8b8..1c0fcfa9f 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -3100,17 +3100,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 9b61c8822..dd111489a 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -3140,17 +3140,17 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Server meldde geen %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Conflict bij het uploaden van sommige bestanden naar een map. Die betreffende conflicterende bestanden zullen worden gewist!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflict bij het uploaden van een map. Het wordt opgeruimd!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_oc.ts b/translations/client_oc.ts index c782daab7..af3af76ac 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -3092,17 +3092,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 7cadb58ec..94430a814 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -3137,17 +3137,17 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>serwer zgłosił brak %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt podczas wysyłania niektórych plików do katalogu. Konfliktowe zostaną wyjaśnione!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt podczas wysyłania katalogu. To się wyjaśni!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt podczas wysyłania pliku. Zostanie usunięty!</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 9d723fbf7..7534af6a8 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -3099,17 +3099,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 61f4fdf06..951875c28 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -3137,17 +3137,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>servidor relatou não %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Conflito ao enviar alguns arquivos para uma pasta. Esses, em conflito, serão eliminados! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflito ao enviar uma pasta. Vai ser limpa! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ro.ts b/translations/client_ro.ts index 2c2ff6847..378ab037a 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -3092,17 +3092,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 5d58ec6e1..bb7f04d60 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -3133,17 +3133,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ответ сервера: %1 отсуствует</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 8260594b9..20c88b700 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -3135,17 +3135,17 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>su serbidore no at torradu perunu %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 9ed5ad545..d4505f223 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -3125,17 +3125,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>server nevrátil žiadne %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt pri nahrávaní niektorých súborov do priečinka. Konfliktné súbory budú odstránené!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt pri nahrávaní priečinka. Bude odstránený!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt pri nahrávaní súboru. Bude odstránený!</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 01736f186..b68d8443c 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -3135,17 +3135,17 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>prejet je odziv strežnika %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 34a75066d..2c0b2a33c 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -3115,17 +3115,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 27eddffdd..9555f0050 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -3117,17 +3117,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 11540bd89..54c1f9057 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -3096,17 +3096,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 629bc0907..5273fdd36 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -3136,17 +3136,17 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>sunucu numarası %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Bir klasör yüklenirken çakışma oldu. Çakışma temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 99797ad10..bf799f5bd 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -3098,17 +3098,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index b1a74e37f..50d5a73f8 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -3119,17 +3119,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>服务器报告无 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>上传文件到文件夹时发生冲突。那些冲突的会被清除!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上传文件夹时发生冲突。它会被清除!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上传时发生冲突。它将被移除！</translation> </message> diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 27148edb1..d430ca2b8 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -3136,17 +3136,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器報告沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上傳資料夾時發生衝突。將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上傳檔案時發生衝突。將被清除！</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 375988ac0..67ca6ef86 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -3137,17 +3137,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器回報沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="941"/> + <location filename="../src/libsync/discovery.cpp" line="946"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="954"/> + <location filename="../src/libsync/discovery.cpp" line="959"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上傳資料夾時發生衝突。將會被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="957"/> + <location filename="../src/libsync/discovery.cpp" line="962"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上傳檔案時發生衝突。其將會被移除！</translation> </message> |