Skip to content

Commit 00e27be

Browse files
Merge branch 'master' into feat/global-configuration
2 parents 54fdf07 + 7d944aa commit 00e27be

File tree

16 files changed

+162
-106
lines changed

16 files changed

+162
-106
lines changed

.github/workflows/gui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
run: |
9090
mkdir -p build
9191
cd build
92-
cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DBUILD_TESTING=OFF -S ..
92+
cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF -S ..
9393
ninja
9494
9595
- name: Install Python Modules

translations/client_de-informal.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ Datei Synchronisations-Applikation.</translation>
433433
<message>
434434
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="202"/>
435435
<source>Disable virtual file support?</source>
436-
<translation type="unfinished"/>
436+
<translation>Deaktiviere Unterstützung für virtuelle Dateien?</translation>
437437
</message>
438438
<message>
439439
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="203"/>
@@ -442,17 +442,19 @@ Datei Synchronisations-Applikation.</translation>
442442
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
443443

444444
This action will abort any currently running synchronization.</source>
445-
<translation type="unfinished"/>
445+
<translation>Diese Aktion wird die Unterstützung für virtuelle Dateien abschalten. Als Konsequenz werden Inhalte aus Ordnern heruntergeladen, die aktuell als &apos;nur online verfügbar&apos; markiert sind.
446+
447+
Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bricht die aktuell laufende Synchronisation ab.</translation>
446448
</message>
447449
<message>
448450
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="211"/>
449451
<source>Disable support</source>
450-
<translation type="unfinished"/>
452+
<translation>Unterstützung abschalten</translation>
451453
</message>
452454
<message>
453455
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="238"/>
454456
<source>Restart sync</source>
455-
<translation type="unfinished"/>
457+
<translation>Synchronisation neu starten</translation>
456458
</message>
457459
<message>
458460
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="240"/>
@@ -467,12 +469,12 @@ This action will abort any currently running synchronization.</source>
467469
<message>
468470
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
469471
<source>Disable virtual file support</source>
470-
<translation type="unfinished"/>
472+
<translation>Unterstützung für virtuelle Dateien deaktivieren</translation>
471473
</message>
472474
<message>
473475
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
474476
<source>Enable virtual file support</source>
475-
<translation type="unfinished"/>
477+
<translation>Unterstützung für virtuelle Dateien einschalten</translation>
476478
</message>
477479
<message>
478480
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="284"/>
@@ -526,7 +528,7 @@ This action will abort any currently running synchronization.</source>
526528
<message>
527529
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="34"/>
528530
<source>Sync options menu</source>
529-
<translation type="unfinished"/>
531+
<translation>Menü „Synchronisierungsoptionen“</translation>
530532
</message>
531533
<message>
532534
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="40"/>

translations/client_de.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ Anwendung zur Datei-Synchronisation.</translation>
433433
<message>
434434
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="202"/>
435435
<source>Disable virtual file support?</source>
436-
<translation type="unfinished"/>
436+
<translation>Deaktiviere Unterstützung für virtuelle Dateien?</translation>
437437
</message>
438438
<message>
439439
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="203"/>
@@ -442,17 +442,19 @@ Anwendung zur Datei-Synchronisation.</translation>
442442
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
443443

444444
This action will abort any currently running synchronization.</source>
445-
<translation type="unfinished"/>
445+
<translation>Diese Aktion wird die Unterstützung für virtuelle Dateien abschalten. Als Konsequenz werden Inhalte aus Ordnern heruntergeladen, die aktuell als &apos;nur online verfügbar&apos; markiert sind.
446+
447+
Das Feature &quot;selective sync&quot; wird wieder verfügbar. Diese Aktion bricht die aktuell laufende Synchronisation ab.</translation>
446448
</message>
447449
<message>
448450
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="211"/>
449451
<source>Disable support</source>
450-
<translation type="unfinished"/>
452+
<translation>Unterstützung abschalten</translation>
451453
</message>
452454
<message>
453455
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="238"/>
454456
<source>Restart sync</source>
455-
<translation type="unfinished"/>
457+
<translation>Synchronisation neu starten</translation>
456458
</message>
457459
<message>
458460
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="240"/>
@@ -467,12 +469,12 @@ This action will abort any currently running synchronization.</source>
467469
<message>
468470
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
469471
<source>Disable virtual file support</source>
470-
<translation type="unfinished"/>
472+
<translation>Unterstützung für virtuelle Dateien deaktivieren</translation>
471473
</message>
472474
<message>
473475
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
474476
<source>Enable virtual file support</source>
475-
<translation type="unfinished"/>
477+
<translation>Unterstützung für virtuelle Dateien einschalten</translation>
476478
</message>
477479
<message>
478480
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="284"/>
@@ -526,7 +528,7 @@ This action will abort any currently running synchronization.</source>
526528
<message>
527529
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="34"/>
528530
<source>Sync options menu</source>
529-
<translation type="unfinished"/>
531+
<translation>Menü „Synchronisierungsoptionen“</translation>
530532
</message>
531533
<message>
532534
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="40"/>

translations/client_en_GB.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ File synchronisation desktop utility.</translation>
433433
<message>
434434
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="202"/>
435435
<source>Disable virtual file support?</source>
436-
<translation type="unfinished"/>
436+
<translation>Disable virtual file support?</translation>
437437
</message>
438438
<message>
439439
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="203"/>
@@ -442,17 +442,21 @@ File synchronisation desktop utility.</translation>
442442
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
443443

444444
This action will abort any currently running synchronization.</source>
445-
<translation type="unfinished"/>
445+
<translation>This action will disable virtual file support. As a consequence contents of folders that are currently marked as &apos;available online only&apos; will be downloaded.
446+
447+
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
448+
449+
This action will abort any currently running synchronisation.</translation>
446450
</message>
447451
<message>
448452
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="211"/>
449453
<source>Disable support</source>
450-
<translation type="unfinished"/>
454+
<translation>Disable support</translation>
451455
</message>
452456
<message>
453457
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="238"/>
454458
<source>Restart sync</source>
455-
<translation type="unfinished"/>
459+
<translation>Restart sync</translation>
456460
</message>
457461
<message>
458462
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="240"/>
@@ -467,12 +471,12 @@ This action will abort any currently running synchronization.</source>
467471
<message>
468472
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
469473
<source>Disable virtual file support</source>
470-
<translation type="unfinished"/>
474+
<translation>Disable virtual file support</translation>
471475
</message>
472476
<message>
473477
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
474478
<source>Enable virtual file support</source>
475-
<translation type="unfinished"/>
479+
<translation>Enable virtual file support</translation>
476480
</message>
477481
<message>
478482
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="284"/>
@@ -526,7 +530,7 @@ This action will abort any currently running synchronization.</source>
526530
<message>
527531
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="34"/>
528532
<source>Sync options menu</source>
529-
<translation type="unfinished"/>
533+
<translation>Sync options menu</translation>
530534
</message>
531535
<message>
532536
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="40"/>

translations/client_en_US.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ File synchronisation desktop utility.</translation>
433433
<message>
434434
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="202"/>
435435
<source>Disable virtual file support?</source>
436-
<translation type="unfinished"/>
436+
<translation>Disable virtual file support?</translation>
437437
</message>
438438
<message>
439439
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="203"/>
@@ -442,17 +442,21 @@ File synchronisation desktop utility.</translation>
442442
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
443443

444444
This action will abort any currently running synchronization.</source>
445-
<translation type="unfinished"/>
445+
<translation>This action will disable virtual file support. As a consequence contents of folders that are currently marked as &apos;available online only&apos; will be downloaded.
446+
447+
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
448+
449+
This action will abort any currently running synchronisation.</translation>
446450
</message>
447451
<message>
448452
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="211"/>
449453
<source>Disable support</source>
450-
<translation type="unfinished"/>
454+
<translation>Disable support</translation>
451455
</message>
452456
<message>
453457
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="238"/>
454458
<source>Restart sync</source>
455-
<translation type="unfinished"/>
459+
<translation>Restart sync</translation>
456460
</message>
457461
<message>
458462
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="240"/>
@@ -467,12 +471,12 @@ This action will abort any currently running synchronization.</source>
467471
<message>
468472
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
469473
<source>Disable virtual file support</source>
470-
<translation type="unfinished"/>
474+
<translation>Disable virtual file support</translation>
471475
</message>
472476
<message>
473477
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
474478
<source>Enable virtual file support</source>
475-
<translation type="unfinished"/>
479+
<translation>Enable virtual file support</translation>
476480
</message>
477481
<message>
478482
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="284"/>
@@ -526,7 +530,7 @@ This action will abort any currently running synchronization.</source>
526530
<message>
527531
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="34"/>
528532
<source>Sync options menu</source>
529-
<translation type="unfinished"/>
533+
<translation>Sync options menu</translation>
530534
</message>
531535
<message>
532536
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="40"/>

translations/client_es.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ Cliente de escritorio para la sincronización de archivos.</translation>
433433
<message>
434434
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="202"/>
435435
<source>Disable virtual file support?</source>
436-
<translation type="unfinished"/>
436+
<translation>¿Desactivar soporte a archivo virtual?</translation>
437437
</message>
438438
<message>
439439
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="203"/>
@@ -442,17 +442,21 @@ Cliente de escritorio para la sincronización de archivos.</translation>
442442
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
443443

444444
This action will abort any currently running synchronization.</source>
445-
<translation type="unfinished"/>
445+
<translation>Esta acción deshabilitará el soporte de archivos virtuales. Como consecuencia, se descargarán los contenidos de las carpetas que actualmente están marcadas como &apos;disponibles solo en línea&apos;.
446+
447+
La única ventaja de deshabilitar el soporte de archivos virtuales es que la función de sincronización selectiva estará disponible nuevamente.
448+
449+
Esta acción abortará cualquier sincronización actualmente en ejecución.</translation>
446450
</message>
447451
<message>
448452
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="211"/>
449453
<source>Disable support</source>
450-
<translation type="unfinished"/>
454+
<translation>Desactivar ayuda</translation>
451455
</message>
452456
<message>
453457
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="238"/>
454458
<source>Restart sync</source>
455-
<translation type="unfinished"/>
459+
<translation>Reiniciar sincronización</translation>
456460
</message>
457461
<message>
458462
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="240"/>
@@ -467,12 +471,12 @@ This action will abort any currently running synchronization.</source>
467471
<message>
468472
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
469473
<source>Disable virtual file support</source>
470-
<translation type="unfinished"/>
474+
<translation>Deaktivieren Sie die Virtual File Unterstützung</translation>
471475
</message>
472476
<message>
473477
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
474478
<source>Enable virtual file support</source>
475-
<translation type="unfinished"/>
479+
<translation>Aktivieren Sie die Virtual File Unterstützung</translation>
476480
</message>
477481
<message>
478482
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="284"/>
@@ -526,7 +530,7 @@ This action will abort any currently running synchronization.</source>
526530
<message>
527531
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="34"/>
528532
<source>Sync options menu</source>
529-
<translation type="unfinished"/>
533+
<translation>Menú de opciones de sincronización</translation>
530534
</message>
531535
<message>
532536
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="40"/>

translations/client_et.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ Failide sünkroniseerimise töölaua rakendus.</translation>
433433
<message>
434434
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="202"/>
435435
<source>Disable virtual file support?</source>
436-
<translation type="unfinished"/>
436+
<translation>Lülita virtuaalse faili tugi välja?</translation>
437437
</message>
438438
<message>
439439
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="203"/>
@@ -442,17 +442,21 @@ Failide sünkroniseerimise töölaua rakendus.</translation>
442442
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
443443

444444
This action will abort any currently running synchronization.</source>
445-
<translation type="unfinished"/>
445+
<translation>See tegevus lülitab välja virtuaalse faili toe. Selle tagajärjel laetakse alla kataloogid märkega &apos;saadaval vaid võrguühendusega&apos;.
446+
447+
Ainus eelis virtuaalse faili toe väljalülitamisel on valikulise sünkroniseerimise võimaluse taastumine.
448+
449+
See tegevus katkestab kõik käimasolevad sünkroniseerimised.</translation>
446450
</message>
447451
<message>
448452
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="211"/>
449453
<source>Disable support</source>
450-
<translation type="unfinished"/>
454+
<translation>Eemalda tugi</translation>
451455
</message>
452456
<message>
453457
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="238"/>
454458
<source>Restart sync</source>
455-
<translation type="unfinished"/>
459+
<translation>Taaskäivita sünkroniseerimine</translation>
456460
</message>
457461
<message>
458462
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="240"/>
@@ -467,12 +471,12 @@ This action will abort any currently running synchronization.</source>
467471
<message>
468472
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
469473
<source>Disable virtual file support</source>
470-
<translation type="unfinished"/>
474+
<translation>Keela virtuaalse faili tugi</translation>
471475
</message>
472476
<message>
473477
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="248"/>
474478
<source>Enable virtual file support</source>
475-
<translation type="unfinished"/>
479+
<translation>Luba virtuaalse faili tugi</translation>
476480
</message>
477481
<message>
478482
<location filename="../src/gui/FoldersGui/accountfolderscontroller.cpp" line="284"/>
@@ -526,7 +530,7 @@ This action will abort any currently running synchronization.</source>
526530
<message>
527531
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="34"/>
528532
<source>Sync options menu</source>
529-
<translation type="unfinished"/>
533+
<translation>Sünkroniseerimise valikute menüü</translation>
530534
</message>
531535
<message>
532536
<location filename="../src/gui/FoldersGui/accountfoldersview.cpp" line="40"/>

0 commit comments

Comments
 (0)