mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into enhancement/change-share-menu-wording

Browse source
This commit is contained in:
Camila Ayres 2019-09-26 11:12:43 +02:00 committed by GitHub
commit 570041e3b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 110 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/settingsdialog.cpp
View file

@ -168,6 +168,23 @@ void SettingsDialog::changeEvent(QEvent *e)
QDialog::changeEvent(e);
}
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
void SettingsDialog::showEvent(QShowEvent *e)
{
QDialog::showEvent(e);
QTimer::singleShot(100, this, &SettingsDialog::timerShowEvent);
}
void SettingsDialog::timerShowEvent()
{
update();
repaint();
}
#endif
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
void SettingsDialog::slotSwitchPage(QAction *action)
{
_ui->stack->setCurrentWidget(_actionGroupWidgets.value(action));

12
src/gui/settingsdialog.h
View file

@ -68,10 +68,22 @@ protected:
void accept() override;
void changeEvent(QEvent *) override;
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
void showEvent(QShowEvent *) override;
#endif
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
private slots:
void accountAdded(AccountState *);
void accountRemoved(AccountState *);
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
void timerShowEvent();
#endif
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
private:
void customizeStyle();
void activityAdded(AccountState *);

17
translations/client_de.ts
View file

@ -976,29 +976,34 @@ Dies bedeutet, dass der Synchronisierungs-Client lokale Änderungen möglicherwe
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Alle Dateien im Synchronisationsordner &apos;%1&apos; wurden auf dem Server gelöscht.
Diese Löschung wird in Ihren lokalen Synchronisationsordner übernommen. Dadurch sind die Dateien nicht mehr verfügbar, falls Sie keine Möglichkeit zur Wiederherstellung haben.
Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder zum Server synchronisiert. Dies geschieht jedoch nur, soweit Sie die Rechte hierzu haben.
Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>Alle Dateien wurden aus Ihrem lokalen Synchronisationsverzeichnis &apos;%1&apos; gelöscht.
Diese Dateien werden auch vom Server gelöscht werden und sind dann auch auf Ihren anderen Geräten verfügbar, sofern sie nicht wiederhergestellt werden.
Wenn die Aktion unbeabsichtigt war, können Sie die gelöschten Danten nun wiederherstellen.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Alle Dateien löschen</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Gelöschte Dateien wiederherstellen</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2971,7 +2976,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Teilen mittels</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

17
translations/client_es.ts
View file

@ -976,29 +976,34 @@ Esto significa que el cliente de sincronización podría no subir inmediatamente
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Todos los archivos en la carpeta de sincronización &apos;%1&apos; han sido eliminados en el servidor.
Esta eliminación se sincronizará con tu carpeta local sincronizada, haciendo que esos archivos ya no estén disponibles a no ser que tengas derecho a restaurarlos.
Si decides restaurar los archivos, volverán a sincronizarse con el servidor si tienes derecho a hacer esto.
Si decides eliminar los archivos, ya no los tendrás disponibles, a no ser que seas el propietario.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>Todos los archivos han sido eliminados de tu carpeta local sincronizada &apos;%1&apos;.
Estos archivos se eliminarán del servidor y no estarán disponibles en tus otros dispositivos si no se restauran.
Si no querías realizar esta acción, puedes recuperar ahora los datos perdidos.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Recuperar archivos eliminados</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2971,7 +2976,7 @@ No se recomienda usarla.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Compartir vía</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

8
translations/client_fr.ts
View file

@ -990,17 +990,17 @@ If this action was unintended you can restore the lost data now.</source>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Restaurer les fichiers supprimés</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2975,7 +2975,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Partager via</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

17
translations/client_gl.ts
View file

@ -976,29 +976,34 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Todos os ficheiros no cartafol de sincronización «%1» foron eliminados no servidor.
Estas eliminacións sincronizarse co seu cartafol de sincronización local, facendo que estes ficheiros non estean dispoñíbeis a menos que teña dereitos para restauralos.
Se decide restaurar os ficheiros, resincronizaranse co servidor se ten dereitos para facelo.
Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>Todos os ficheiros foron eliminados do seu cartafol de sincronización local «%1».
Estes ficheiros eliminaranse do servidor e non estarán dispoñibles nos outros dispositivos se non se restauran.
Se esta acción non foi intencionada, pode restaurar os datos perdidos agora.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Eliminar todos os ficheiros?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Eliminar todos os ficheiros</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Restaurar os ficheiros eliminados</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2972,7 +2977,7 @@ Recomendámoslle que non o use.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Compartido mediante</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

17
translations/client_it.ts
View file

@ -977,29 +977,34 @@ Questo significa che il client di sincronizzazione potrebbe non caricare le modi
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Tutti i file nella cartella di sincronizzazione &apos;%1&apos; sono stati eliminati sul server.
L&apos;eliminazione sarà sincronizzata con la tua cartella locale, rendendo tali file indisponibili, a meno che tu abbia il permesso per ripristinarli.
Se decidi di ripristinare i file, essi saranno sincronizzati nuovamente con il server, se hai i diritti per farlo.
Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia il proprietario.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>Tutti i file sono stati eliminati dalla tua cartella di sincronizzazione locale &apos;%1&apos;.
Questi file saranno eliminati dal server e non saranno disponibili sugli altri tuoi dispositivi se non saranno ripristinati.
Se questa azione non era voluta, puoi ripristinare subito i dati persi.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Vuoi eliminare tutti i file?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Elimina tutti i file</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Ripristina file eliminati</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2972,7 +2977,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Condividi tramite</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

17
translations/client_pl.ts
View file

@ -976,29 +976,34 @@ Oznacza to, że klient synchronizacji może nie przesłać lokalnych zmian natyc
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Wszystkie pliki z folderu synchronizacji &apos;%1&apos; zostały usunięte z serwera.
W momencie synchronizacji zostaną usunięte z lokalnego folderu, co spowoduje ich niedostępność, chyba że posiadasz prawo do przywracania.
Jeśli zdecydujesz się przywrócić pliki i posiadasz odpowiednie uprawnienia, zostaną one ponownie przesłane na serwer.
Jeśli zdecydujesz się je usunąć, nie będą już dostępne. </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>Wszystkie pliki zostały usunięte z lokalnego folderu synchronizacji &apos;%1&apos;.
Pliki te zostaną usunięte z serwera i nie będą dostępne na innych urządzeniach, chyba że zostaną przywrócone.
Jeśli ta akcja była niezamierzona, możesz teraz przywrócić utracone dane.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Przywróć usunięte pliki</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2972,7 +2977,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Współdziel przez</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

17
translations/client_sv.ts
View file

@ -976,29 +976,34 @@ Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar ome
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>Alla filer i den synkade mappen &apos;%1&apos; raderades på servern.
Dessa raderingar kommer att synkroniseras till din lokalt synkade mapp och göra filerna otillgängliga, om du inte har möjlighet att återställa.
Om du återställer dessa filer kommer dom att synkroniseras till servern på nytt, om du har rättighet att göra det.
Om du raderar filerna kommer dom att vara otillgängliga för dig, om du inte är ägaren.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>Alla filer raderades från din lokalt synkade mapp &apos;%1&apos;.
Dessa filer kommer att raderas från servern och kommer inte att vara tillgängliga på dina andra enheter om de inte återställs.
Om den här åtgärden var oavsiktlig kan du återställa förlorad data nu.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Radera alla filer?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Radera alla filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Återställ raderade filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2972,7 +2977,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Dela via</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>

17
translations/client_tr.ts
View file

@ -974,29 +974,34 @@ Bunun sonucunda eşitleme istemcisi yerel değişiklikleri anında yükleyemez.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
<translation type="unfinished"/>
<translation>&apos;%1&apos; eşitleme klasöründeki tüm dosyalar silinecek.
Silinen bu dosyalar yerel eşitleme klasörünüzden de silineceğinden, geri yükleme yetkiniz yoksa bu dosyaları kullanamayacaksınız.
Geri yükleme yetkiniz varsa ve geri yüklemeyi seçerseniz, dosyalar sunucu ile yeniden eşitlenir.
Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1087"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
<translation>&apos;%1&apos; yerel eşitleme klasöründeki tüm dosyalar silindi.
Bu dosyalar sunucudan da silinecek ve geri yüklenmez ise diğer aygıtlarınız üzerinden de erişilemeyecek.
Bu işlemi kasıtlı olarak yapmıyorsanız şu anda silinen verileri geri geri yükleyebilirsiniz.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1091"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
<translation>Tüm dosyalar silinsin mi?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1094"/>
<source>Delete all files</source>
<translation type="unfinished"/>
<translation>Tüm dosyaları sil</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1095"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
<translation>Silinmiş dosyaları geri yükle</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="1112"/>
@ -2970,7 +2975,7 @@ Kullanmanız önerilmez.</translation>
<message>
<location filename="../src/gui/socketapi.cpp" line="626"/>
<source>Share via </source>
<translation type="unfinished"/>
<translation>Şununla paylaş</translation>
</message>
<message>
<location filename="../src/gui/socketapi.cpp" line="627"/>