Merge remote-tracking branch 'origin/2.10'

owncloud · Jul 12, 2022 · 404e1b7 · 404e1b7
2 parents 240b9d3 + 1b7e6be
commit 404e1b7
Show file tree

Hide file tree

Showing 26 changed files with 2,426 additions and 2,426 deletions.
diff --git a/src/gui/folder.h b/src/gui/folder.h
@@ -133,8 +133,8 @@ class FolderDefinition
     QString _localPath;
     /// path on remote (usually no trailing /, exception "/")
     QString _targetPath;
+    bool _deployed = false;
 
-    bool _deployed;
     friend class FolderMan;
 };
 

diff --git a/translations/client_ar.ts b/translations/client_ar.ts
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
diff --git a/translations/client_de-informal.ts b/translations/client_de-informal.ts
diff --git a/translations/client_de.ts b/translations/client_de.ts
diff --git a/translations/client_de_AT.ts b/translations/client_de_AT.ts
diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
diff --git a/translations/client_el.ts b/translations/client_el.ts
diff --git a/translations/client_en.ts b/translations/client_en.ts
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
diff --git a/translations/client_es.ts b/translations/client_es.ts
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
diff --git a/translations/client_he.ts b/translations/client_he.ts
diff --git a/translations/client_it.ts b/translations/client_it.ts
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
diff --git a/translations/client_sq.ts b/translations/client_sq.ts
diff --git a/translations/client_th.ts b/translations/client_th.ts
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts