diff options
| author | Nextcloud bot <bot@nextcloud.com> | 2021-06-16 06:57:33 +0300 |
|---|---|---|
| committer | Nextcloud bot <bot@nextcloud.com> | 2021-06-16 06:57:33 +0300 |
| commit | 73d244cd9cf4ab53313fc64c298973f278c5bb2f (patch) | |
| tree | 09de8ffc2fc827e7a6e2642fbac847932064d29e /translations | |
| parent | ed6a5c66b301e1d28efe008e03fad276fe6eecb2 (diff) | |
[tx-robot] updated from transifex
Diffstat (limited to 'translations')
56 files changed, 561 insertions, 1 deletions
diff --git a/translations/client_bg.ts b/translations/client_bg.ts index a12185952..b2e58b8bc 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -3123,6 +3123,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнориран заради черния списък 'изберете какво да синхронизирате'</translation> diff --git a/translations/client_br.ts b/translations/client_br.ts index 05ce87491..9f9cc8041 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -3099,6 +3099,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 227856810..f485f9b89 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -3088,6 +3088,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>S'ha ignorat perquè es troba a la llista de prohibicions «Trieu què voleu sincronitzar»</translation> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 6ba86b6cd..8975dfd64 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -3121,6 +3121,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorováno podle nastavení „vybrat co synchronizovat“</translation> diff --git a/translations/client_da.ts b/translations/client_da.ts index 76eca9531..4f29a6d49 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -3099,6 +3099,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_de.ts b/translations/client_de.ts index a6d17236e..3f42d80b6 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -3121,6 +3121,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoriert wegen der "Choose what to sync"-Blacklist</translation> diff --git a/translations/client_el.ts b/translations/client_el.ts index 22378a9c7..36db61baf 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -3102,6 +3102,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Αγνοήθηκε λόγω της μαύρης λίστας "επιλέξτε τι να συγχρονίσετε".</translation> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 5a96a2a96..55c565a15 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -3090,6 +3090,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 52a9e02f7..e604c68ef 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -3096,6 +3096,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es.ts b/translations/client_es.ts index 492e717ff..60bcfbf13 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado porque se encuentra en la lista negra de «elija qué va a sincronizar»</translation> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 650ded707..7be1f8bc8 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -3077,6 +3077,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index c3908cdc2..9d2cbdc96 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 402d51e27..8ee7e866c 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 8c49ac63b..996d63462 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index e8afc6099..b0f53970d 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index c912270de..617b5fa2b 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 8e6d17105..fff5a7859 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 2fbc0364c..b7da8a80b 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 10a58dad4..ad7e7c7da 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 89f5ec3d4..39d78f4f4 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_et.ts b/translations/client_et.ts index ee300ec02..a834c8544 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -3077,6 +3077,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index b9fe431d4..ebb54560d 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ez ikusi egin zaio, "aukeratu zer sinkronizatu" zerrenda beltzagatik.</translation> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index b9516c5c7..72e37b10f 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -3081,6 +3081,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index e6bf0a1d3..2c0c4154f 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -3085,6 +3085,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 1c02f88d3..3f02e47bf 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -3113,6 +3113,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 396bd838a..0ed097aaf 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation> diff --git a/translations/client_he.ts b/translations/client_he.ts index c6f27326d..5f02d5830 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -3084,6 +3084,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 6dfc779b1..11d580edc 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Zanemareno zbog crne liste „odaberi što će se sinkronizirati”</translation> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 36c10df53..94daca9e6 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -3120,6 +3120,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>A "válassza ki a szinkronizálni kívánt elemeket" feketelista miatt figyelmen kívül hagyva</translation> diff --git a/translations/client_id.ts b/translations/client_id.ts index 339db7acc..ffe93a3fa 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -3089,6 +3089,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_is.ts b/translations/client_is.ts index 0db7e4a51..d64325f20 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -3093,6 +3093,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_it.ts b/translations/client_it.ts index 1589dcaa6..a90ec1e02 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -3112,6 +3112,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index d9242c282..96096602a 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -3118,6 +3118,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"選択されたものを同期する" のブラックリストにあるために無視されました</translation> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 7ac3044c4..1feb2cb97 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -3126,6 +3126,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"동기화 할 대상 선택" 블랙리스트로 인해 무시되었습니다.</translation> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 91546e5e3..21e053f91 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -3098,6 +3098,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 546191d1f..149539ed8 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -3079,6 +3079,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_mk.ts b/translations/client_mk.ts index ceaa7cb1f..e3771493c 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -3088,6 +3088,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 038816db6..e9a8fda06 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 803acbd05..cd5f40cf8 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -3125,6 +3125,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Genegeerd vanwege de "wat synchroniseren" negeerlijst</translation> diff --git a/translations/client_oc.ts b/translations/client_oc.ts index 052541570..92b96df72 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -3077,6 +3077,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 6930d05f0..551c59151 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorowane z powodu czarnej listy "Wybierz co synchronizować"</translation> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 4a7c69d9d..02f376cb1 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -3084,6 +3084,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index bc184ce98..2779c9290 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado devido à lista negra "escolher o que sincronizar" </translation> diff --git a/translations/client_ro.ts b/translations/client_ro.ts index 8cff4dabb..747a3ecc5 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -3077,6 +3077,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 9aafc47ba..79b6b7fa0 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -3118,6 +3118,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнорируется из-за совпадения с записью в списке исключений из синхронизации</translation> diff --git a/translations/client_sc.ts b/translations/client_sc.ts index ac5e10c38..912a1aebe 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -2924,7 +2924,7 @@ Si cunsìgiat de non ddu impreare.</translation> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="592"/> <source>Successfully connected to %1!</source> - <translation>Sa connessione a %1 est andada bene!</translation> + <translation>Connessione a %1 renèssida!</translation> </message> <message> <location filename="../src/gui/owncloudsetupwizard.cpp" line="599"/> @@ -3120,6 +3120,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoradu ca in sa lista niedda de is cosas de no sincronizare</translation> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 83321df44..10f4b0ccc 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -3101,6 +3101,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 0ead5faf7..999b4bb4f 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -3120,6 +3120,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Predmet ni usklajevan, ker je na »črnem seznamu datotek« za usklajevanje</translation> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 881c0a39b..441d37633 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -3100,6 +3100,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 0718c9cb6..d02fae1d7 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -3102,6 +3102,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_th.ts b/translations/client_th.ts index 6efa8de3e..b11ec0a84 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -3081,6 +3081,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 26bacd249..310e16e61 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -3121,6 +3121,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"Eşitlenecek ögeleri seçin" kara listesinde olduğundan yok sayıldı</translation> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 7c352ba68..ba65c7704 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -3083,6 +3083,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index b70ae99c6..f89053353 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -3104,6 +3104,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>因“选择要同步的内容”黑名单而被忽略</translation> diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index aed407d55..4ef39b293 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -3121,6 +3121,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>被忽略，因為它在“選擇要同步的內容”黑名單中</translation> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 06cd487fb..21e71a95a 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -3122,6 +3122,16 @@ 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="924"/> + <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="930"/> + <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="1225"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>由於「選擇要同步的內容」黑名單而被忽略</translation> |