diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index 52903defb..79e8bb599 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -21,7 +21,7 @@ Icon=@APPLICATION_EXECUTABLE@ # Translations -Icon[de_DE]=@APPLICATION_ICON_NAME@ -Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung -Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung -GenericName[de_DE]=Ordnersynchronisierung +Icon[de]=@APPLICATION_ICON_NAME@ +Name[de]=@APPLICATION_NAME@ Desktop +Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung +GenericName[de]=Ordner-Synchronisation diff --git a/translations/client_bg.ts b/translations/client_bg.ts index a3ddbab59..b5f8b379e 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -3138,13 +3138,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss сървърът е отчел не % 1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_br.ts b/translations/client_br.ts index 8c751ef85..65f8dcfaf 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -3114,13 +3114,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_ca.ts b/translations/client_ca.ts index ae27cfa58..17b648ed5 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -3103,13 +3103,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 97a72600e..37cba10cf 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -3136,14 +3136,19 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros server nahlásil žádné %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Konflikt při nahrávání některých souborů do složky. Ty, které jsou v konfliktu budou vymazány! + + + Conflict when uploading a folder. It's going to get cleared! Konflikt při nahrávání složky. Bude vymazána! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Konflikt při nahrávání některých souborů do složky. Ty, které jsou v konfliktu budou vymazány! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_da.ts b/translations/client_da.ts index ff984aa1a..865b3824e 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -3118,13 +3118,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_de.ts b/translations/client_de.ts index 0af7c6219..40ae1a539 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -3136,14 +3136,19 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver Server meldet kein %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Konflikt beim Hochladen einiger Dateien in einen Ordner. Diejenigen, die in Konflikt stehen, werden gelöscht! + + + Conflict when uploading a folder. It's going to get cleared! Konflikt beim Hochladen eines Ordners. Er wird gelöscht! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Konflikt beim Hochladen einiger Dateien in einen Ordner. Diejenigen, die in Konflikt stehen, werden gelöscht! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_el.ts b/translations/client_el.ts index 55f2273db..9c430b91f 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -3117,13 +3117,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss ο διακομιστής δεν ανέφερε %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 2a586fe43..f842115fb 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -3105,13 +3105,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_eo.ts b/translations/client_eo.ts index cb0920234..871e8ba4b 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -3111,13 +3111,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es.ts b/translations/client_es.ts index df1c468a7..46cc96773 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -3137,13 +3137,18 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c el servidor informó de no %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 2dc8fc871..83072a77f 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -3092,13 +3092,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 3df8afe42..e814e0b20 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index e5de74c6a..23d717201 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 59fc6ebfe..53d457764 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 8a118d417..788bc91d4 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 9f704f801..14a84f0b6 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 7bf503673..426b1f91e 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 6828d0ffc..a52bc93ea 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index be6e76c38..b0a35da47 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 11f9c792f..27748e4ee 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_et.ts b/translations/client_et.ts index 47157247a..101ad6f90 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -3092,13 +3092,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_eu.ts b/translations/client_eu.ts index da88872bf..d51c7be0c 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -3137,14 +3137,19 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di zerbitzariak ez du %1-rik jakinarazi - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira! + + + Conflict when uploading a folder. It's going to get cleared! Gatazka gertatu da karpeta kargatzean. Garbituko da! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 8447ea2d2..09c3315e0 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -3096,13 +3096,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_fi.ts b/translations/client_fi.ts index f69ea53cd..b80915db1 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -3100,13 +3100,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 4f5fb2de2..43a877393 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -3128,13 +3128,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 9871bf4ed..142d1fdd5 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -3137,13 +3137,18 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe o servidor non informou de %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_he.ts b/translations/client_he.ts index 4635f65ae..c1ce831ee 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -3101,13 +3101,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 31acb4920..8a207abf1 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -3137,13 +3137,18 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav poslužitelj javlja da nema %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_hu.ts b/translations/client_hu.ts index b113a5be7..4546041b5 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -3135,13 +3135,18 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, kérjük, jelezze szerver nem jelentett %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_id.ts b/translations/client_id.ts index de52e3be0..167bb23c4 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -3104,13 +3104,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_is.ts b/translations/client_is.ts index 9a3ba1407..65e557bda 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -3108,13 +3108,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_it.ts b/translations/client_it.ts index 85d9efab7..e1a2342f8 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -3127,13 +3127,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss il server non ha restituito alcun %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 2663c040c..69dab1af1 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -3133,13 +3133,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss サーバーから no %1 と通知がありました - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 2948acdd5..219b201de 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -3141,13 +3141,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss 서버가 %1이(가) 없다고(아니라고) 보고함 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 6b9f4e926..cb5fd7e4a 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -3113,13 +3113,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 5ef5627e0..032fd87e8 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -3094,13 +3094,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 4ffadd4b0..5b182fa24 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -3103,13 +3103,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index f2976a465..b00687693 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -3100,13 +3100,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_nl.ts b/translations/client_nl.ts index a47eca4b2..9a34d5948 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -3140,14 +3140,19 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen Server meldde geen %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Conflict bij het uploaden van sommige bestanden naar een map. Die betreffende conflicterende bestanden zullen worden gewist! + + + Conflict when uploading a folder. It's going to get cleared! Conflict bij het uploaden van een map. Het wordt opgeruimd! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Conflict bij het uploaden van sommige bestanden naar een map. Die betreffende conflicterende bestanden zullen worden gewist! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_oc.ts b/translations/client_oc.ts index fa81502db..ad9f84d77 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -3092,13 +3092,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 058eab231..5075ec979 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -3137,14 +3137,19 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł serwer zgłosił brak %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Konflikt podczas wysyłania niektórych plików do katalogu. Konfliktowe zostaną wyjaśnione! + + + Conflict when uploading a folder. It's going to get cleared! Konflikt podczas wysyłania katalogu. To się wyjaśni! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Konflikt podczas wysyłania niektórych plików do katalogu. Konfliktowe zostaną wyjaśnione! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 202689033..94552dd46 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -3099,13 +3099,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index b87d20d0c..ddfa33ca6 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -3137,14 +3137,19 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr servidor relatou não %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Conflito ao enviar alguns arquivos para uma pasta. Esses, em conflito, serão eliminados! + + + Conflict when uploading a folder. It's going to get cleared! Conflito ao enviar uma pasta. Vai ser limpa! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Conflito ao enviar alguns arquivos para uma pasta. Esses, em conflito, serão eliminados! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_ro.ts b/translations/client_ro.ts index e527818a1..3276d0d86 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -3092,13 +3092,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 91933bd10..4f90e3ecf 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -3133,13 +3133,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss ответ сервера: %1 отсуствует - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_sc.ts b/translations/client_sc.ts index a51ec7e60..802bcb3fa 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -3135,13 +3135,18 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal su serbidore no at torradu perunu %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 7b75bacf6..4062c0bb9 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -3123,13 +3123,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss server nevrátil žiadne %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 9cc465bf1..85a87fb86 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -3135,13 +3135,18 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o prejet je odziv strežnika %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_sr.ts b/translations/client_sr.ts index d25da29d1..a9db4238e 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -3115,13 +3115,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 2a620aec8..2b6ef90ae 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -3117,13 +3117,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_th.ts b/translations/client_th.ts index b68d43a90..5b2cead44 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -3096,13 +3096,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 937b2c940..bb8948f0d 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -3136,14 +3136,19 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş sunucu numarası %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek! + + + Conflict when uploading a folder. It's going to get cleared! Bir klasör yüklenirken çakışma oldu. Çakışma temizlenecek! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 89d4925d1..5941900e0 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -3098,13 +3098,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + + + Conflict when uploading a folder. It's going to get cleared! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + + Conflict when uploading a file. It's going to get removed! diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index fff27febd..1d63cdb37 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -3119,14 +3119,19 @@ This is a new, experimental mode. If you decide to use it, please report any iss 服务器报告无 %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + 上传文件到文件夹时发生冲突。那些冲突的会被清除! + + + Conflict when uploading a folder. It's going to get cleared! 上传文件夹时发生冲突。它会被清除! - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - 上传文件到文件夹时发生冲突。那些冲突的会被清除! + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 25f84ee6d..a28c5006e 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -3136,14 +3136,19 @@ This is a new, experimental mode. If you decide to use it, please report any iss 伺服器報告沒有 %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + 將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除！ + + + Conflict when uploading a folder. It's going to get cleared! 上傳資料夾時發生衝突。將被清除！ - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - 將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除！ + + Conflict when uploading a file. It's going to get removed! + diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 5b00cbb24..2282b9a75 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -3137,14 +3137,19 @@ This is a new, experimental mode. If you decide to use it, please report any iss 伺服器回報沒有 %1 - + + Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! + 將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除！ + + + Conflict when uploading a folder. It's going to get cleared! 上傳資料夾時發生衝突。將會被清除！ - - Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared! - 將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除！ + + Conflict when uploading a file. It's going to get removed! +