diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 2e5e45dee..5bd2d6c83 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -532,14 +532,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -590,7 +590,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -625,164 +625,164 @@ p, li { white-space: pre-wrap; } - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Updating password-store - + Content hidden - - + + Password - + OTP Code - + Clipboard cleared - + Clipboard not cleared - + Password and Content hidden - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard @@ -861,32 +861,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts index e5c51dfc7..4573a5a6c 100644 --- a/localization/localization_ca.ts +++ b/localization/localization_ca.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Edita - + Delete Suprimeix @@ -621,7 +621,7 @@ p, li { white-space: pre-wrap; } - + Users Usuaris @@ -680,39 +680,39 @@ p, li { white-space: pre-wrap; } Afegeix una carpeta - + Failed to connect WebDAV: Ha fallat la connexió a WebDAV: - + QtPass WebDAV password Contrasenya de WebDAV de QtPass - + Enter password to connect to WebDAV: Introduïu la contrasenya per connectar a WebDAV: - + fusedav exited unexpectedly fusedav ha sortit inesperadament - + Failed to start fusedav to connect WebDAV: Ha fallat l'inici de fusedav per connectar a WebDAV: - - + + Updating password-store Actualització del magatzem de contrasenyes @@ -729,33 +729,33 @@ p, li { white-space: pre-wrap; } S'ha ocultat la contrasenya - + Content hidden S'ha ocultat el contingut - - + + Password Contrasenya - + OTP Code Codi OTP - + Clipboard cleared S'ha netejat el porta-retalls - + Clipboard not cleared No s'ha netejat el porta-retalls - + Password and Content hidden S'ha ocultat el porta-retalls i la contrasenya @@ -784,40 +784,40 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Cerca de: %1 - - + + New file Fitxer nou - + New password file: (Will be placed in %1 ) Fitxer de contrasenyes nou: (s'ubicarà a %1 ) - + and the whole content? i tot el contingut? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> i tot el contingut? <br><strong>Atenció: hi ha fitxers inesperats a la carpeta indicada, comproveu-los abans de continuar.</strong> - + Are you sure you want to delete %1%2 Esteu segur que voleu suprimir %1%2 - + Delete password? Suprimir la contrasenya? @@ -826,7 +826,7 @@ p, li { white-space: pre-wrap; } Esteu segur que voleu suprimir %1? - + Delete folder? Suprimir la carpeta? @@ -839,58 +839,58 @@ p, li { white-space: pre-wrap; } i tot el contingut - + Can not get key list No es pot obtenir la llista de claus - + Unable to get list of available gpg keys No es pot obtenir la llista de claus gpg disponibles - + Key not found in keyring No s'ha trobat la clau a l'anell de claus - + Generating GPG key pair Generació del parell de claus GPG - + Profile changed to %1 S'ha canviat el perfil a %1 - + Open folder with file manager Obre la carpeta amb el gestor de fitxers - + Add folder Afegeix una carpeta - + Add password Afegeix una contrasenya - + New Folder: (Will be placed in %1 ) Carpeta nova: (s'ubicarà a %1 ) - + Copied to clipboard S'ha copiat al porta-retalls @@ -968,32 +968,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index a780a01db..cde83dcb1 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Upravit - + Delete Smazat @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } - + Users Uživatelé @@ -662,39 +662,39 @@ p, li { white-space: pre-wrap; } Přidat adresář - + Failed to connect WebDAV: Selhalo připojení k WebDAV: - + QtPass WebDAV password QtPass WebDAV heslo - + Enter password to connect to WebDAV: Vložte heslo pro připojení k WebDAV: - + fusedav exited unexpectedly fusedav neočekávaně skončil - + Failed to start fusedav to connect WebDAV: Selhalo spuštění fusedav pro připojení k WebDAV: - - + + Updating password-store Aktualizace úložiště hesel @@ -711,33 +711,33 @@ p, li { white-space: pre-wrap; } Skryté heslo - + Content hidden Skrytý obsah - - + + Password Heslo - + OTP Code - + Clipboard cleared Schránka vymazána - + Clipboard not cleared Schránka nevymazána - + Password and Content hidden Skryté heslo i obsah @@ -766,40 +766,40 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Vyhledávání: %1 - - + + New file Nový soubor - + New password file: (Will be placed in %1 ) Nový soubor s heslem: (Bude uložen do %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Opravdu chcete smazat %1%2? - + Delete password? Smazat heslo? @@ -808,7 +808,7 @@ p, li { white-space: pre-wrap; } Opravdu chcete smazat %1? - + Delete folder? Smazat adresář? @@ -817,58 +817,58 @@ p, li { white-space: pre-wrap; } Opravdu chcete smazat %1? {1%2??} - + Can not get key list Nelze získat seznam klíčů - + Unable to get list of available gpg keys Nelze získat seznam dostupných gpg klíčů - + Key not found in keyring Klíč nebyl v klíčence nalezen - + Generating GPG key pair Generování páru GPG klíčů - + Profile changed to %1 Profil změněn na %1 - + Open folder with file manager - + Add folder Přidat adresář - + Add password Přidat heslo - + New Folder: (Will be placed in %1 ) Nový adresář: (Bude umístěn do %1 ) - + Copied to clipboard zkopírovat do schránky @@ -946,32 +946,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 4f2826371..afb1668d8 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -533,14 +533,14 @@ Expire-Date: 0 - + Edit Ändern - + Delete Löschen @@ -603,7 +603,7 @@ p, li { white-space: pre-wrap; } - + Users Benutzer @@ -637,35 +637,35 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Passwort Speicher aktualisieren - + Clipboard cleared Zwischenablage gelöscht - + Are you sure you want to delete %1%2 Sind Sie sicher, dass Sie %1%2 löschen wollen - + Open folder with file manager Öffnen Sie den Ordner mit dem Dateimanager - + New Folder: (Will be placed in %1 ) Neuer Ordner: (Wird in %1 platziert werden) - + Failed to connect WebDAV: Verbindung zu WebDAV fehlgeschlagen: @@ -679,23 +679,23 @@ p, li { white-space: pre-wrap; } Ordner Hinzufügen - + QtPass WebDAV password QtPass WebDAV Passwort - + Enter password to connect to WebDAV: Passwort für WebDAV eingeben: - + fusedav exited unexpectedly Unerwarteter Abbruch durch fusedav - + Failed to start fusedav to connect WebDAV: fusedav konnte nicht gestartet werden, WebDav Verbindung fehlgeschlagen: @@ -705,28 +705,28 @@ p, li { white-space: pre-wrap; } Passwort ausgeblendet - + Content hidden Inhalt ausgeblendet - - + + Password Passwort - + OTP Code OTP-Code - + Clipboard not cleared Zwischenablage nicht geleert - + Password and Content hidden Password und Inhalt ausgeblendet @@ -763,21 +763,21 @@ p, li { white-space: pre-wrap; } und einhalt - + Copied to clipboard in Zwischenablage kopiert - + Add folder Ordner hinzufügen - + Add password Passwort hinzufügen @@ -787,7 +787,7 @@ p, li { white-space: pre-wrap; } Willkommen bei QtPass %1 - + Looking for: %1 Suche nach: %1 @@ -796,13 +796,13 @@ p, li { white-space: pre-wrap; } Ändern nicht möglich - - + + New file Neue Datei - + Delete password? Passwort löschen? @@ -811,7 +811,7 @@ p, li { white-space: pre-wrap; } Sind Sie sicher, dass Sie %1 löschen wollen? - + Delete folder? Ordner löschen? @@ -820,7 +820,7 @@ p, li { white-space: pre-wrap; } Gewählte Passwort-Datei existiert nicht, Änderung nicht möglich - + New password file: (Will be placed in %1 ) @@ -828,37 +828,37 @@ Neues Passwort-Datei: (Wird in %1 platziert werden) - + and the whole content? und der ganze Inhalt? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> und der gesamte Inhalt? <br><strong>Achtung: Im angegebenen Ordner befinden sich Dateien, überprüfen Sie diese, bevor Sie fortfahren.</strong> - + Can not get key list Schlüssel-Liste nicht gefunden - + Unable to get list of available gpg keys gpg Schlüssel-Liste konnte nicht gefunden werden - + Key not found in keyring Schlüssel nicht in Keyring gefunden - + Generating GPG key pair GPG Schlüssel-Paar wird generiert - + Profile changed to %1 Profil geändert zu %1 @@ -936,32 +936,32 @@ Neues Passwort-Datei: QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 8b2f9bdf1..1979b2602 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -532,14 +532,14 @@ Expire-Date: 0 - + Edit Ändern - + Delete Löschen @@ -602,7 +602,7 @@ p, li { white-space: pre-wrap; } - + Users Benutzer @@ -636,35 +636,35 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Password Store aktualisieren - + Clipboard cleared Zwischenablage gelöscht - + Are you sure you want to delete %1%2 Sind Sie sicher, dass Sie %1%2 löschen wollen? - + Open folder with file manager - + New Folder: (Will be placed in %1 ) Neuer Ordner: (Wird in %1 platziert werden) - + Failed to connect WebDAV: Verbindung zu WebDAV fehlgeschlagen: @@ -678,23 +678,23 @@ p, li { white-space: pre-wrap; } Ordner Hinzufügen - + QtPass WebDAV password QtPass WebDAV Passwort - + Enter password to connect to WebDAV: Passwort für WebDAV eingeben: - + fusedav exited unexpectedly Unerwarteter Abbruch durch fusedav - + Failed to start fusedav to connect WebDAV: fusedav konnte nicht gestartet werden, WebDav Verbindung fehlgeschlagen: @@ -704,28 +704,28 @@ p, li { white-space: pre-wrap; } Passwort ausgeblendet - + Content hidden Inhalt ausgeblendet - - + + Password Passwort - + OTP Code - + Clipboard not cleared Zwischenablage nicht geleert - + Password and Content hidden Password und Inhalt ausgeblendet @@ -758,21 +758,21 @@ p, li { white-space: pre-wrap; } Sind Sie sicher, dass Sie %1 löschen wollen? {1%2??} - + Copied to clipboard in Zwischenablage kopiert - + Add folder Ordner hinzufügen - + Add password Passwort hinzufügen @@ -782,7 +782,7 @@ p, li { white-space: pre-wrap; } Wilkommen bei QtPass %1 - + Looking for: %1 Suche nach: %1 @@ -791,13 +791,13 @@ p, li { white-space: pre-wrap; } Ändern nicht möglich - - + + New file Neue Datei - + Delete password? Passwort löschen? @@ -806,7 +806,7 @@ p, li { white-space: pre-wrap; } Sind Sie sicher, dass Sie %1 löschen wollen? - + Delete folder? Ordner löschen? @@ -815,7 +815,7 @@ p, li { white-space: pre-wrap; } Gewählte Passwort-Datei existiert nicht, Änderung nicht möglich - + New password file: (Will be placed in %1 ) @@ -823,37 +823,37 @@ Neues Passwort-Datei: (Wird in %1 platziert werden) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Can not get key list Schlüssel-Liste nicht gefunden - + Unable to get list of available gpg keys gpg Schlüssel-Liste konnte nicht gefunden werden - + Key not found in keyring Schlüssel nicht in Keyring gefunden - + Generating GPG key pair GPG Schlüssel-Paar wird generiert - + Profile changed to %1 Profil geändert zu %1 @@ -931,32 +931,32 @@ Neues Passwort-Datei: QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index 6cb9a11de..1e316e63e 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -518,164 +518,164 @@ Expire-Date: 0 - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Updating password-store - + Content hidden - - + + Password - + OTP Code - + Clipboard cleared - + Clipboard not cleared - + Password and Content hidden - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard copied to clipboard @@ -699,14 +699,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -757,7 +757,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -860,32 +860,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index 68cfe2482..172a35128 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Edit - + Delete Delete @@ -632,7 +632,7 @@ p, li { white-space: pre-wrap; } - + Users Users @@ -691,39 +691,39 @@ p, li { white-space: pre-wrap; } Add Folder - + Failed to connect WebDAV: Failed to connect WebDAV: - + QtPass WebDAV password QtPass WebDAV password - + Enter password to connect to WebDAV: Enter password to connect to WebDAV: - + fusedav exited unexpectedly fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: Failed to start fusedav to connect WebDAV: - - + + Updating password-store Updating password-store @@ -740,33 +740,33 @@ p, li { white-space: pre-wrap; } Password hidden - + Content hidden Content hidden - - + + Password Password - + OTP Code OTP Code - + Clipboard cleared Clipboard cleared - + Clipboard not cleared Clipboard not cleared - + Password and Content hidden Password and Content hidden @@ -795,40 +795,40 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Looking for: %1 - - + + New file New file - + New password file: (Will be placed in %1 ) New password file: (Will be placed in %1 ) - + and the whole content? and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Are you sure you want to delete %1%2 - + Delete password? Delete password? @@ -837,7 +837,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to delete %1? - + Delete folder? Delete folder? @@ -850,58 +850,58 @@ p, li { white-space: pre-wrap; } and whole content - + Can not get key list Can not get key list - + Unable to get list of available gpg keys Unable to get list of available gpg keys - + Key not found in keyring Key not found in keyring - + Generating GPG key pair Generating GPG key pair - + Profile changed to %1 Profile changed to %1 - + Open folder with file manager Open folder with file manager - + Add folder Add folder - + Add password Add password - + New Folder: (Will be placed in %1 ) New Folder: (Will be placed in %1 ) - + Copied to clipboard copied to clipboard @@ -979,32 +979,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts index d942a11c8..f24ae2233 100644 --- a/localization/localization_en_US.ts +++ b/localization/localization_en_US.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Edit - + Delete Delete @@ -632,7 +632,7 @@ p, li { white-space: pre-wrap; } - + Users Users @@ -691,39 +691,39 @@ p, li { white-space: pre-wrap; } Add Folder - + Failed to connect WebDAV: Failed to connect WebDAV: - + QtPass WebDAV password QtPass WebDAV password - + Enter password to connect to WebDAV: Enter password to connect to WebDAV: - + fusedav exited unexpectedly fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: Failed to start fusedav to connect WebDAV: - - + + Updating password-store Updating password-store @@ -740,33 +740,33 @@ p, li { white-space: pre-wrap; } Password hidden - + Content hidden Content hidden - - + + Password Password - + OTP Code OTP Code - + Clipboard cleared Clipboard cleared - + Clipboard not cleared Clipboard not cleared - + Password and Content hidden Password and Content hidden @@ -795,40 +795,40 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Looking for: %1 - - + + New file New file - + New password file: (Will be placed in %1 ) New password file: (Will be placed in %1 ) - + and the whole content? and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Are you sure you want to delete %1%2 - + Delete password? Delete password? @@ -837,7 +837,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to delete %1? - + Delete folder? Delete folder? @@ -850,58 +850,58 @@ p, li { white-space: pre-wrap; } and whole content - + Can not get key list Can not get key list - + Unable to get list of available gpg keys Unable to get list of available gpg keys - + Key not found in keyring Key not found in keyring - + Generating GPG key pair Generating GPG key pair - + Profile changed to %1 Profile changed to %1 - + Open folder with file manager Open folder with file manager - + Add folder Add folder - + Add password Add password - + New Folder: (Will be placed in %1 ) New Folder: (Will be placed in %1 ) - + Copied to clipboard Copied to clipboard @@ -979,32 +979,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts index d886f6981..ee2b03f95 100644 --- a/localization/localization_es_ES.ts +++ b/localization/localization_es_ES.ts @@ -525,14 +525,14 @@ Expire-Date: 0 - + Edit Editar - + Delete Borrar @@ -595,7 +595,7 @@ p, li { white-space: pre-wrap; } - + Users Usuarios @@ -629,61 +629,61 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Actualizando password-store - + Clipboard cleared Portapapeles vacío - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Está seguro que quiere borrar %1%2? - + Failed to connect WebDAV: No se pudo conectar WebDAV: - + QtPass WebDAV password Contraseña QtPass WebDAV - + Enter password to connect to WebDAV: Introduzca contraseña para conectarse a WebDAV: - + fusedav exited unexpectedly fusedav se ha cerrado inesperadamente - + Failed to start fusedav to connect WebDAV: Error al iniciar fusedav para conectar WebDAV: @@ -693,28 +693,28 @@ p, li { white-space: pre-wrap; } Contraseña oculta - + Content hidden Contenido oculto - - + + Password Contraseña - + OTP Code - + Clipboard not cleared Portapapeles no vaciado - + Password and Content hidden Contraseña y contenido oculto @@ -743,7 +743,7 @@ p, li { white-space: pre-wrap; } QProcess::Error desconocido - + New Folder: (Will be placed in %1 ) @@ -753,26 +753,26 @@ p, li { white-space: pre-wrap; } Está seguro que quiere borrar %1? {1%2??} - + Copied to clipboard copiado en el portapapeles - + Add folder Añadir carpeta - + Open folder with file manager - + Add password Añadir contraseña @@ -782,7 +782,7 @@ p, li { white-space: pre-wrap; } Bienvenido a QtPass %1 - + Looking for: %1 Buscando %1 @@ -791,13 +791,13 @@ p, li { white-space: pre-wrap; } No se puede editar - - + + New file Nuevo fichero - + Delete password? Borrar contraseña? @@ -806,7 +806,7 @@ p, li { white-space: pre-wrap; } Está seguro que quiere borrar %1? - + Delete folder? Borrar carpeta? @@ -815,27 +815,27 @@ p, li { white-space: pre-wrap; } Fichero de contraseñas seleccionado no existe, no se puede editar - + Can not get key list No se puede obtener lista de claves - + Unable to get list of available gpg keys No se puede obtener lista de llaves gpg disponibles - + Key not found in keyring La llave no se encuentra en el llavero - + Generating GPG key pair Generar par de claves GPG - + Profile changed to %1 Perfil cambiado a %1 @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::Fallo al iniciar - + QProcess::Crashed QProcess::Roto - + QProcess::Timedout QProcess::Caducado - + QProcess::ReadError QProcess::Error de lectura - + QProcess::WriteError QProcess::Error de escritura - + QProcess::UnknownError QProcess::Error desconocido diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts index 8f9f8cd6b..071b88f9c 100644 --- a/localization/localization_fr_BE.ts +++ b/localization/localization_fr_BE.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Editer - + Delete Supprimer @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } - + Users Utilisateurs @@ -662,39 +662,39 @@ p, li { white-space: pre-wrap; } Ajouter dossier - + Failed to connect WebDAV: Impossible de se connecter au WebDAV : - + QtPass WebDAV password Mot de passe WebDAV QtPass - + Enter password to connect to WebDAV: Entrez un mot de passe pour vous connecter au WebDAV : - + fusedav exited unexpectedly fusedav s'est terminé de manière improviste - + Failed to start fusedav to connect WebDAV: Impossible de démarrer fusedav pour se connecter au WebDAV : - - + + Updating password-store Mise à jour du magasin de mots de passe @@ -711,33 +711,33 @@ p, li { white-space: pre-wrap; } Mot de passe caché - + Content hidden Contenu caché - - + + Password Mot de passe - + OTP Code - + Clipboard cleared Presse-papiers vidé - + Clipboard not cleared Presse-papiers non vidé - + Password and Content hidden Mot de passe et contenu cachés @@ -766,40 +766,40 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Recherche de : %1 - - + + New file Nouveau fichier - + New password file: (Will be placed in %1 ) Enregistrement d'un nouveau mot de passe : (Sera stocké dans %1) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Êtes-vous sûr de vouloir supprimer %1%2? - + Delete password? Supprimer le mot de passe ? @@ -808,7 +808,7 @@ p, li { white-space: pre-wrap; } Êtes-vous sûr de vouloir supprimer %1 ? - + Delete folder? Supprimer le dossier ? @@ -817,58 +817,58 @@ p, li { white-space: pre-wrap; } Êtes-vous sûr de vouloir supprimer %1 ? {1%2??} - + Can not get key list Impossible de récupérer la liste de clés - + Unable to get list of available gpg keys Impossible d'obtenir la liste des clés GPG disponibles - + Key not found in keyring Clé introuvable dans le trousseau de clés - + Generating GPG key pair Génération d'une paire de clés GPG - + Profile changed to %1 Profil changé vers %1 - + Open folder with file manager - + Add folder Ajouter un dossier - + Add password Ajouter un mot de passe - + New Folder: (Will be placed in %1 ) Nouveau dossier : (Sera créé dans %1) - + Copied to clipboard copié dans le presse-papiers @@ -946,32 +946,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts index 61932edb4..0764328e4 100644 --- a/localization/localization_fr_FR.ts +++ b/localization/localization_fr_FR.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Editer - + Delete Supprimer @@ -620,7 +620,7 @@ p, li { white-space: pre-wrap; } - + Users Utilisateurs @@ -680,39 +680,39 @@ p, li { white-space: pre-wrap; } Ajouter dossier - + Failed to connect WebDAV: Impossible de se connecter au WebDAV : - + QtPass WebDAV password Mot de passe WebDAV QtPass - + Enter password to connect to WebDAV: Entrez un mot de passe pour vous connecter au WebDAV : - + fusedav exited unexpectedly fusedav a quitté inopinément - + Failed to start fusedav to connect WebDAV: Impossible de démarrer fusedav pour se connecter au WebDAV : - - + + Updating password-store Mise à jour du magasin de mots de passe @@ -729,33 +729,33 @@ p, li { white-space: pre-wrap; } Mot de passe caché - + Content hidden Contenu caché - - + + Password Mot de passe - + OTP Code - + Clipboard cleared Presse-papiers vidé - + Clipboard not cleared Presse-papiers non vidé - + Password and Content hidden Mot de passe et contenu cachés @@ -784,39 +784,39 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Recherche de : %1 - - + + New file Nouveau fichier - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Êtes-vous certain de vouloir supprimer %1%2? - + New Folder: (Will be placed in %1 ) @@ -828,7 +828,7 @@ p, li { white-space: pre-wrap; } (Placé dans %1) - + Delete password? Supprimer le mot de passe ? @@ -837,7 +837,7 @@ p, li { white-space: pre-wrap; } Êtes-vous sûr de vouloir supprimer %1 ? - + Delete folder? Supprimer le dossier ? @@ -850,46 +850,46 @@ p, li { white-space: pre-wrap; } et tout son contenu ? - + Can not get key list Impossible de récupérer la liste de clés - + Unable to get list of available gpg keys Impossible d'obtenir la liste des clés GPG disponibles - + Key not found in keyring Clé introuvable dans le trousseau de clés - + Generating GPG key pair Génération d'une paire de clés GPG - + Profile changed to %1 Profil sélectionné : %1 - + Open folder with file manager - + Add folder Ajouter un dossier - + Add password Ajouter un mot de passe @@ -900,7 +900,7 @@ p, li { white-space: pre-wrap; } (Placé dans %1) - + Copied to clipboard copié dans le presse-papiers @@ -978,32 +978,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts index 0d07f5ec4..f4007f7e2 100644 --- a/localization/localization_fr_LU.ts +++ b/localization/localization_fr_LU.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Editer - + Delete Supprimer @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } - + Users Utilisateurs @@ -662,39 +662,39 @@ p, li { white-space: pre-wrap; } Ajouter dossier - + Failed to connect WebDAV: Impossible de se connecter au WebDAV : - + QtPass WebDAV password Mot de passe WebDAV QtPass - + Enter password to connect to WebDAV: Entrez un mot de passe pour vous connecter au WebDAV : - + fusedav exited unexpectedly fusedav s'est terminé de manière improviste - + Failed to start fusedav to connect WebDAV: Impossible de démarrer fusedav pour se connecter au WebDAV : - - + + Updating password-store Mise à jour du magasin de mots de passe @@ -711,33 +711,33 @@ p, li { white-space: pre-wrap; } Mot de passe caché - + Content hidden Contenu caché - - + + Password Mot de passe - + OTP Code - + Clipboard cleared Presse-papiers vidé - + Clipboard not cleared Presse-papiers non vidé - + Password and Content hidden Mot de passe et contenu cachés @@ -766,40 +766,40 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 Recherche de : %1 - - + + New file Nouveau fichier - + New password file: (Will be placed in %1 ) Enregistrement d'un nouveau mot de passe : (Sera stocké dans %1) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Êtes-vous sûr de vouloir supprimer %1%2? - + Delete password? Supprimer le mot de passe ? @@ -808,7 +808,7 @@ p, li { white-space: pre-wrap; } Êtes-vous sûr de vouloir supprimer %1 ? - + Delete folder? Supprimer le dossier ? @@ -817,58 +817,58 @@ p, li { white-space: pre-wrap; } Êtes-vous sûr de vouloir supprimer %1 ? {1%2??} - + Can not get key list Impossible de récupérer la liste de clés - + Unable to get list of available gpg keys Impossible d'obtenir la liste des clés GPG disponibles - + Key not found in keyring Clé introuvable dans le trousseau de clés - + Generating GPG key pair Génération d'une paire de clés GPG - + Profile changed to %1 Profil changé vers %1 - + Open folder with file manager - + Add folder Ajouter un dossier - + Add password Ajouter un mot de passe - + New Folder: (Will be placed in %1 ) Nouveau dossier : (Sera créé dans %1) - + Copied to clipboard copié dans le presse-papiers @@ -946,32 +946,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts index 6dcf67010..d44f4ee7c 100644 --- a/localization/localization_gl_ES.ts +++ b/localization/localization_gl_ES.ts @@ -599,14 +599,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -657,7 +657,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -727,13 +727,13 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Actualizando password-store - + Clipboard cleared Portapapeis baleiro @@ -747,56 +747,56 @@ p, li { white-space: pre-wrap; } - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - + Content hidden Contido oculto - - + + Password - + OTP Code - + Clipboard not cleared - + Password and Content hidden @@ -825,99 +825,99 @@ p, li { white-space: pre-wrap; } QProcess::Erro descoñecido - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard @@ -999,32 +999,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::Fallou o inicio - + QProcess::Crashed QProcess::Fallou - + QProcess::Timedout QProcess::Caducou - + QProcess::ReadError QProcess::Erro de lectura - + QProcess::WriteError QProcess::Erro de escritura - + QProcess::UnknownError QProcess::Erro descoñecido diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts index de98501f6..a98525aec 100644 --- a/localization/localization_he_IL.ts +++ b/localization/localization_he_IL.ts @@ -532,14 +532,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -590,7 +590,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -625,164 +625,164 @@ p, li { white-space: pre-wrap; } - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Updating password-store - + Content hidden - - + + Password - + OTP Code - + Clipboard cleared - + Clipboard not cleared - + Password and Content hidden - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard @@ -861,32 +861,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts index 9549a0346..2d2651349 100644 --- a/localization/localization_hu_HU.ts +++ b/localization/localization_hu_HU.ts @@ -532,14 +532,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -590,7 +590,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -624,18 +624,18 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Jelszó-tároló frissítése - + Clipboard cleared Vágólap tiszta - + Content hidden Oldal elrejtve @@ -645,51 +645,51 @@ p, li { white-space: pre-wrap; } - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Password - + OTP Code - + Clipboard not cleared - + Password and Content hidden @@ -718,99 +718,99 @@ p, li { white-space: pre-wrap; } IsmeretlenHiba - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard a vágólapra másolt @@ -888,32 +888,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess:NemIndultEl - + QProcess::Crashed QProcess:Összeomlás - + QProcess::Timedout QProcess:Időtúllépés - + QProcess::ReadError QProcess:OlvasásiHiba - + QProcess::WriteError IrásHiba - + QProcess::UnknownError IsmeretlenHiba diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index fd342513a..2c319608c 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -546,14 +546,14 @@ Expire-Date: 0 - + Edit Modifica - + Delete Elimina @@ -616,7 +616,7 @@ p, li { white-space: pre-wrap; } - + Users Utenti @@ -695,39 +695,39 @@ p, li { white-space: pre-wrap; } Aggiungi Cartella - + Failed to connect WebDAV: Impossibile connettersi a WebDAV: - + QtPass WebDAV password QtPass WebDAV password - + Enter password to connect to WebDAV: Inserisci la password per connetersi a WebDAV: - + fusedav exited unexpectedly fusedav si è chiuso in modo anomalo - + Failed to start fusedav to connect WebDAV: Impossibile connettere fusedav a WebDAV: - - + + Updating password-store Aggiornando password-store @@ -744,33 +744,33 @@ p, li { white-space: pre-wrap; } Password nascosta - + Content hidden Contenuto nascosto - - + + Password Password - + OTP Code - + Clipboard cleared Appunti svuotati - + Clipboard not cleared Appunti non svuotati - + Password and Content hidden Password e Contenuto nascosti @@ -799,40 +799,40 @@ p, li { white-space: pre-wrap; } QProcess::WriteError - + Looking for: %1 Cercando: %1 - - + + New file Nuovo file - + New password file: (Will be placed in %1 ) Nuovo file password: (Verrà posizionato in %1 ) - + and the whole content? e l'intero contenuto? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> e l'intero contenuto? <br><strong>Attenzione: ci sono file inattesi nella cartella selezionata, controlla prima di continuare.</strong> - + Are you sure you want to delete %1%2 Sei sicuro di voler eliminare %1%2 - + Delete password? Eliminare password? @@ -841,7 +841,7 @@ p, li { white-space: pre-wrap; } Sei sicuro di voler eliminare %1? - + Delete folder? Eliminare cartella? @@ -854,58 +854,58 @@ p, li { white-space: pre-wrap; } e l'intero contenuto - + Can not get key list Impossibile ottenere la lista delle chiavi - + Unable to get list of available gpg keys Impossibile ottenere la lista delle chiavi gpg disponibili - + Key not found in keyring Chiave non trovata nel portachiavi - + Generating GPG key pair Generando una coppia di chiavi GPG - + Profile changed to %1 Profilo cambiato in %1 - + Open folder with file manager Apri la cartella con il gestore file - + Add folder Aggiungi cartella - + Add password Aggiungi password - + New Folder: (Will be placed in %1 ) Nuova cartella: (Verrà posizionata in %1 ) - + Copied to clipboard copiato negli appunti @@ -983,32 +983,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::WriteError diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts index d726e8465..aedfc2ab3 100644 --- a/localization/localization_lb_LU.ts +++ b/localization/localization_lb_LU.ts @@ -532,14 +532,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -590,7 +590,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -625,164 +625,164 @@ p, li { white-space: pre-wrap; } - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Updating password-store - + Content hidden - - + + Password - + OTP Code - + Clipboard cleared - + Clipboard not cleared - + Password and Content hidden - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard @@ -860,32 +860,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts index 0572da64b..ff90d2150 100644 --- a/localization/localization_nl_BE.ts +++ b/localization/localization_nl_BE.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Bewerken - + Delete Verwijderen @@ -631,7 +631,7 @@ p, li { white-space: pre-wrap; } - + Users Gebruikers @@ -685,38 +685,38 @@ p, li { white-space: pre-wrap; } Voeg map toe - + Failed to connect WebDAV: Verbinding mislukt met WebDAV: - + QtPass WebDAV password QtPass WebDAV wachtwoord - + Enter password to connect to WebDAV: Voer wachtwoord in om te verbinden met WebDAV: - + fusedav exited unexpectedly fusedav is stuk, hield er zomaar mee op - + Failed to start fusedav to connect WebDAV: Kon fusedav niet verbinden met WebDAV: - - + + Updating password-store Vernieuwen password-store @@ -733,33 +733,33 @@ p, li { white-space: pre-wrap; } Wachtwoord verborgen - + Content hidden Inhoud verborgen - - + + Password Wachtwoord - + OTP Code OTP Code - + Clipboard cleared Klembord gewist - + Clipboard not cleared Klembord niet leeg gemaakt aangezien er geen wachtwoord in stond - + Password and Content hidden Wachtwoord en inhoud verborgen @@ -788,40 +788,40 @@ p, li { white-space: pre-wrap; } Er ging iets raars mis met proces - + Looking for: %1 Op zoek naar: %1 - - + + New file Nieuw bestand - + New password file: (Will be placed in %1 ) Nieuw wachtwoord bestand: (Wordt geplaatst in %1 ) - + and the whole content? en gehele inhoud? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> en de gehele inhoud? <br><strong>Let op: ter zijn onverwachte bestanden gevonden, controleer deze voor verwijden.</strong> - + Are you sure you want to delete %1%2 Weet je zeker dat je %1%2 wil verwijderen - + Delete password? Verwijder wachtwoord? @@ -830,7 +830,7 @@ p, li { white-space: pre-wrap; } Weet je zeker dat je %1 wil verwijderen? - + Delete folder? Verwijder map? @@ -843,58 +843,58 @@ p, li { white-space: pre-wrap; } en inhoud - + Can not get key list Kan sleutel lijst niet verkrijgen - + Unable to get list of available gpg keys Kan lijst van beschikbare gpg sleutels niet opvragen - + Key not found in keyring Sleutel niet gevonden in keyring - + Generating GPG key pair Nieuw GPG sleutelpaar genereren - + Profile changed to %1 Profiel veranderd naar %1 - + Open folder with file manager Open map met bestands beheer - + Add folder Voeg map toe - + Add password Voeg wachtwoord toe - + New Folder: (Will be placed in %1 ) Nieuwe map: (Wordt geplaatst in %1 ) - + Copied to clipboard gekopieerd naar het klembord @@ -972,32 +972,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart Proces kon niet worden gestart - + QProcess::Crashed Proces is gecrashed - + QProcess::Timedout Proces duurde te lang - + QProcess::ReadError Lees fout met proces - + QProcess::WriteError Kan niet schrijven naar proces - + QProcess::UnknownError Er ging iets raars mis met proces diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts index df23be2b5..c660670bf 100644 --- a/localization/localization_nl_NL.ts +++ b/localization/localization_nl_NL.ts @@ -545,14 +545,14 @@ Expire-Date: 0 - + Edit Bewerken - + Delete Verwijderen @@ -631,7 +631,7 @@ p, li { white-space: pre-wrap; } - + Users Gebruikers @@ -685,38 +685,38 @@ p, li { white-space: pre-wrap; } Voeg map toe - + Failed to connect WebDAV: Verbinding mislukt met WebDAV: - + QtPass WebDAV password QtPass WebDAV wachtwoord - + Enter password to connect to WebDAV: Voer wachtwoord in om te verbinden met WebDAV: - + fusedav exited unexpectedly fusedav is stuk, hield er zomaar mee op - + Failed to start fusedav to connect WebDAV: Kon fusedav niet verbinden met WebDAV: - - + + Updating password-store Vernieuwen password-store @@ -733,33 +733,33 @@ p, li { white-space: pre-wrap; } Wachtwoord verborgen - + Content hidden Inhoud verborgen - - + + Password Wachtwoord - + OTP Code OTP Code - + Clipboard cleared Klembord gewist - + Clipboard not cleared Klembord niet leeg gemaakt aangezien er geen wachtwoord in stond - + Password and Content hidden Wachtwoord en inhoud verborgen @@ -788,40 +788,40 @@ p, li { white-space: pre-wrap; } Er ging iets raars mis met proces - + Looking for: %1 Op zoek naar: %1 - - + + New file Nieuw bestand - + New password file: (Will be placed in %1 ) Nieuw wachtwoord bestand: (Wordt geplaatst in %1 ) - + and the whole content? en gehele inhoud? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> en de gehele inhoud? <br><strong>Let op: ter zijn onverwachte bestanden gevonden, controleer deze voor verwijden.</strong> - + Are you sure you want to delete %1%2 Weet je zeker dat je %1%2 wil verwijderen - + Delete password? Verwijder wachtwoord? @@ -830,7 +830,7 @@ p, li { white-space: pre-wrap; } Weet je zeker dat je %1 wil verwijderen? - + Delete folder? Verwijder map? @@ -843,58 +843,58 @@ p, li { white-space: pre-wrap; } en inhoud - + Can not get key list Kan sleutel lijst niet verkrijgen - + Unable to get list of available gpg keys Kan lijst van beschikbare gpg sleutels niet opvragen - + Key not found in keyring Sleutel niet gevonden in keyring - + Generating GPG key pair Nieuw GPG sleutelpaar genereren - + Profile changed to %1 Profiel veranderd naar %1 - + Open folder with file manager Open map met bestands beheer - + Add folder Voeg map toe - + Add password Voeg wachtwoord toe - + New Folder: (Will be placed in %1 ) Nieuwe map: (Wordt geplaatst in %1 ) - + Copied to clipboard gekopieerd naar het klembord @@ -972,32 +972,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart Proces kon niet worden gestart - + QProcess::Crashed Proces is gecrashed - + QProcess::Timedout Proces duurde te lang - + QProcess::ReadError Lees fout met proces - + QProcess::WriteError Kan niet schrijven naar proces - + QProcess::UnknownError Er ging iets raars mis met proces diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts index b6d4a3a56..99d86853c 100644 --- a/localization/localization_pl_PL.ts +++ b/localization/localization_pl_PL.ts @@ -518,164 +518,164 @@ Expire-Date: 0 - + Failed to connect WebDAV: - + QtPass WebDAV password - + Enter password to connect to WebDAV: - + fusedav exited unexpectedly - + Failed to start fusedav to connect WebDAV: - - + + Updating password-store - + Content hidden - - + + Password - + OTP Code - + Clipboard cleared - + Clipboard not cleared - + Password and Content hidden - + Looking for: %1 - - + + New file - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? - + Delete password? - + Are you sure you want to delete %1%2 - + Can not get key list - + Unable to get list of available gpg keys - + Key not found in keyring - + Generating GPG key pair - + Profile changed to %1 - + Open folder with file manager - + Add folder - + Add password - + New Folder: (Will be placed in %1 ) - + Copied to clipboard skopiowany do schowka @@ -699,14 +699,14 @@ p, li { white-space: pre-wrap; } - + Edit - + Delete @@ -757,7 +757,7 @@ p, li { white-space: pre-wrap; } - + Users @@ -860,32 +860,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError diff --git a/localization/localization_pt_PT.ts b/localization/localization_pt_PT.ts index a50ba2b7a..e2335e4b6 100644 --- a/localization/localization_pt_PT.ts +++ b/localization/localization_pt_PT.ts @@ -525,14 +525,14 @@ Expire-Date: 0 - + Edit Editar - + Delete Remover @@ -595,7 +595,7 @@ p, li { white-space: pre-wrap; } - + Users Utilizadores @@ -660,36 +660,36 @@ p, li { white-space: pre-wrap; } Adicionar pasta - + Failed to connect WebDAV: A ligação a WebDAV falhou: - + QtPass WebDAV password Password do QtPass WebDAV - + Enter password to connect to WebDAV: Introduza a password para a ligação a WebDAV: - + fusedav exited unexpectedly fusedav fechou inesperadamente - + Failed to start fusedav to connect WebDAV: A inicialização do fusedav, para ligar a WebDAV falhou: - - + + Updating password-store A atualizar a password-store @@ -698,33 +698,33 @@ p, li { white-space: pre-wrap; } Password ocultada - + Content hidden Conteúdo oculto - - + + Password Password - + OTP Code - + Clipboard cleared Clipboard limpo - + Clipboard not cleared Clipboard não limpo - + Password and Content hidden Password e conteúdo ocultos @@ -753,45 +753,45 @@ p, li { white-space: pre-wrap; } QProcess::UnknownError - + Looking for: %1 À procura de: %1 - - + + New file Novo ficheiro - + New password file: (Will be placed in %1 ) Novo ficheiro de password: (Vai ser colocado em %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 De certeza que deseja remover %1%2? - + Delete folder? Remover pasta? - + Delete password? Remover password? @@ -804,57 +804,57 @@ p, li { white-space: pre-wrap; } e todo o seu conteúdo - + Can not get key list Não é possível obter a lista de chaves - + Unable to get list of available gpg keys Não é possível obter a lista de chaves gpg disponíveis - + Key not found in keyring Chave não disponível no keyring - + Generating GPG key pair Gerar par de chaves GPG - + Profile changed to %1 Perfil mudou para %1 - + Open folder with file manager - + Add folder Adicionar pasta - + Add password Adicionar password - + New Folder: (Will be placed in %1 ) Nova pasta: (Será colocada em %1 ) - + Copied to clipboard Copiado para o Clipboard @@ -932,32 +932,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProcess::FailedToStart - + QProcess::Crashed QProcess::Crashed - + QProcess::Timedout QProcess::Timedout - + QProcess::ReadError QProcess::ReadError - + QProcess::WriteError QProcess::WriteError - + QProcess::UnknownError QProcess::UnknownError diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts index e80c981a4..14619a6fc 100644 --- a/localization/localization_ru_RU.ts +++ b/localization/localization_ru_RU.ts @@ -573,14 +573,14 @@ p, li { white-space: pre-wrap; } - + Edit Изменить - + Delete Удалить @@ -616,7 +616,7 @@ p, li { white-space: pre-wrap; } - + Users Пользователи @@ -655,47 +655,47 @@ p, li { white-space: pre-wrap; } QtPass %1 приветствует Вас - + Failed to connect WebDAV: Не удалось подключить WebDAV: - + QtPass WebDAV password Пароль QtPass для WebDAV - + Enter password to connect to WebDAV: Введите пароль для подключения к WebDAV: - + fusedav exited unexpectedly fusedav непредвиденно завершился - + Failed to start fusedav to connect WebDAV: Не удалось запустить fusedav для подключения к WebDAV: - - + + Updating password-store Обновление password-store - + Open folder with file manager - + New Folder: (Will be placed in %1 ) Новая папка: @@ -714,33 +714,33 @@ p, li { white-space: pre-wrap; } Добавить папку - + Content hidden Содержимое скрыто - - + + Password Пароль - + OTP Code - + Clipboard cleared Буфер обмена очищен - + Clipboard not cleared Буфер обмена не очищен - + Password and Content hidden Пароль и содержимое скрыто @@ -769,22 +769,22 @@ p, li { white-space: pre-wrap; } QProsess::Неизвестная ошибка - + Looking for: %1 Ищем: %1 - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Delete folder? Удалить папку? @@ -793,31 +793,31 @@ p, li { white-space: pre-wrap; } Вы в самом деле хотите удалить %1? {1%2??} - + Generating GPG key pair Генерирую ключевую пару GPG - + Profile changed to %1 Профиль изменён на %1 - + Add folder Добавить папку - + Add password Добавить пароль - + Copied to clipboard скопировать в буфер обмена @@ -826,40 +826,40 @@ p, li { white-space: pre-wrap; } Невозможно изменить содержимое - + New password file: (Will be placed in %1 ) Новый файл для пароля: (будет создан в %1 ) - + Are you sure you want to delete %1%2 Вы в самом деле хотите удалить %1%2? - + Can not get key list Не удалось получить список ключей - + Unable to get list of available gpg keys Не удалось получить список доступных ключей GPG - + Key not found in keyring Ключ не найден в хранилище ключей GPG - - + + New file Новый файл - + Delete password? Удалить пароль? @@ -945,32 +945,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart QProsess::Не удалось запустить - + QProcess::Crashed QProsess::Аварийное завершение - + QProcess::Timedout QProsess::Превышено время ожидания - + QProcess::ReadError QProsess::Ошибка чтения - + QProcess::WriteError QProsess::Ошибка записи - + QProcess::UnknownError QProsess::Неизвестная ошибка diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts index 0279889cd..9fc2ecbfd 100644 --- a/localization/localization_sv_SE.ts +++ b/localization/localization_sv_SE.ts @@ -526,14 +526,14 @@ Expire-Date: 0 - + Edit Ändra - + Delete Ta bort @@ -596,7 +596,7 @@ p, li { white-space: pre-wrap; } - + Users Användare @@ -630,72 +630,72 @@ p, li { white-space: pre-wrap; } qtpass - - + + Updating password-store Uppdaterar lösenordsutrymmet - + OTP Code - + Clipboard cleared Urklippet rensat - + New password file: (Will be placed in %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 Vill du verkligen ta bort %%21? - + New Folder: (Will be placed in %1 ) - + Failed to connect WebDAV: Kunde inte ansluta till WebDAV: - + QtPass WebDAV password QtPass WebDAV lösenord - + Enter password to connect to WebDAV: Mata in WebDAV lösenord: - + fusedav exited unexpectedly fusedav avslutades oväntat - + Failed to start fusedav to connect WebDAV: Kunde inte starta fusedav för att ansluta till WebDAV: @@ -705,23 +705,23 @@ p, li { white-space: pre-wrap; } Gömt lösenord - + Content hidden Gömt innehåll - - + + Password Lösenord - + Clipboard not cleared Urklippet ej rensat - + Password and Content hidden Gömt lösenord och innehåll @@ -730,26 +730,26 @@ p, li { white-space: pre-wrap; } Vill du verkligen ta bort %1? {1%2??} - + Copied to clipboard kopieras till Urklipp - + Add folder Lägg till mapp - + Open folder with file manager - + Add password Lägg till lösenord @@ -759,7 +759,7 @@ p, li { white-space: pre-wrap; } Välkommen till QtPass %1 - + Looking for: %1 Söker efter: %1 @@ -768,13 +768,13 @@ p, li { white-space: pre-wrap; } Kan inte ändra - - + + New file Ny fil - + Delete password? Ta bort lösenord? @@ -783,7 +783,7 @@ p, li { white-space: pre-wrap; } Vill du verkligen ta bort %1? - + Delete folder? Ta bort mapp? @@ -792,27 +792,27 @@ p, li { white-space: pre-wrap; } Kan inte ändra då vald lösenordsfil inte finns - + Can not get key list Kan inte hämta nyckellista - + Unable to get list of available gpg keys Kunde inte hämta gpgnycklar - + Key not found in keyring Kunde inte hitta nyckel i nyckelring - + Generating GPG key pair Skapar GPG nyckelpar - + Profile changed to %1 Profil ändrad till %1 @@ -890,32 +890,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart - + QProcess::Crashed - + QProcess::Timedout - + QProcess::ReadError - + QProcess::WriteError - + QProcess::UnknownError diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts index f333fec1b..972b71559 100644 --- a/localization/localization_zh_CN.ts +++ b/localization/localization_zh_CN.ts @@ -544,14 +544,14 @@ Expire-Date: 0 - + Edit 编辑 - + Delete 删除 @@ -614,7 +614,7 @@ p, li { white-space: pre-wrap; } - + Users 用户 @@ -661,39 +661,39 @@ p, li { white-space: pre-wrap; } 新文件夹 - + Failed to connect WebDAV: 无法连接 WebDAV： - + QtPass WebDAV password QtPass WebDAV 密码 - + Enter password to connect to WebDAV: 输入 WebDAV 密码以连接： - + fusedav exited unexpectedly fusedav 意外退出 - + Failed to start fusedav to connect WebDAV: 无法连接 WebDAV，fusedav无法启动： - - + + Updating password-store 正在更新密码库... @@ -710,33 +710,33 @@ p, li { white-space: pre-wrap; } 密码已隐藏 - + Content hidden 内容已隐藏 - - + + Password 密码 - + OTP Code - + Clipboard cleared 剪贴板已清除 - + Clipboard not cleared 剪贴板未清除 - + Password and Content hidden 密码和内容已隐藏 @@ -765,40 +765,40 @@ p, li { white-space: pre-wrap; } 系统错误：未知错误 QProcess::UnknownError - + Looking for: %1 搜索：%1 - - + + New file 新密码 - + New password file: (Will be placed in %1 ) 新建密码： （将被放在 %1 ) - + and the whole content? - + and the whole content? <br><strong>Attention: there are unexpected files in the given folder, check them before continue.</strong> - + Are you sure you want to delete %1%2 确定删除 %1%2? - + Delete password? 删除密码？ @@ -807,7 +807,7 @@ p, li { white-space: pre-wrap; } 确定删除 %1 ？ - + Delete folder? 删除文件夹？ @@ -816,58 +816,58 @@ p, li { white-space: pre-wrap; } 确定删除 %1%2 ？ - + Can not get key list 无法获取密钥列表 - + Unable to get list of available gpg keys 无法获取可用的 GPG 密钥列表 - + Key not found in keyring 所选密钥未找到 - + Generating GPG key pair 正在生成 GPG 密钥对 - + Profile changed to %1 用户已更改为 %1 - + Open folder with file manager - + Add folder 新文件夹 - + Add password 新密码 - + New Folder: (Will be placed in %1 ) 新建文件夹： （将被放在 %1 ) - + Copied to clipboard 复制到剪贴板 @@ -945,32 +945,32 @@ p, li { white-space: pre-wrap; } QtPass - + QProcess::FailedToStart 系统错误：启动失败 QProcess::FailedToStart - + QProcess::Crashed 系统错误：程序崩溃 QProcess::Crashed - + QProcess::Timedout 系统错误：响应超时 QProcess::Timedout - + QProcess::ReadError 系统错误：读取错误 QProcess::ReadError - + QProcess::WriteError 系统错误：写入错误 QProcess::WriteError - + QProcess::UnknownError 系统错误：未知错误 QProcess::UnknownError diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e81091d04..b13ab5c73 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -182,15 +182,28 @@ void MainWindow::changeEvent(QEvent *event) { } } +const QModelIndex MainWindow::getCurrentTreeViewIndex() { + return ui->treeView->currentIndex(); +} + void MainWindow::setTextTextBrowser(const QString &text) { ui->textBrowser->setText(text); } -void MainWindow::flashText(const QString &text, const bool isError) { - if (isError) ui->textBrowser->setTextColor(Qt::red); +void MainWindow::flashText(const QString &text, const bool isError, + const bool isHtml) { + if (isError) + ui->textBrowser->setTextColor(Qt::red); + if (isHtml) { + QString _text = text; + if (!ui->textBrowser->toPlainText().isEmpty()) + _text = ui->textBrowser->toHtml() + _text; + ui->textBrowser->setHtml(_text); + } else { ui->textBrowser->setText(text); ui->textBrowser->setTextColor(Qt::black); + } } /** @@ -204,25 +217,26 @@ void MainWindow::connectPassSignalHandlers(Pass *pass) { // TODO(bezet): this is never emitted(should be), also naming(see // critical()) // connect(pass, &Pass::error, this, &MainWindow::processError); - connect(pass, &Pass::startingExecuteWrapper, this, - &MainWindow::executeWrapperStarted); - connect(pass, &Pass::critical, this, &MainWindow::critical); - connect(pass, &Pass::statusMsg, this, &MainWindow::showStatusMessage); - connect(pass, &Pass::processErrorExit, this, &MainWindow::processErrorExit); - - connect(pass, &Pass::finishedGitInit, this, &MainWindow::passStoreChanged); - connect(pass, &Pass::finishedGitPull, this, &MainWindow::processFinished); - connect(pass, &Pass::finishedGitPush, this, &MainWindow::processFinished); - connect(pass, &Pass::finishedShow, this, &MainWindow::passShowHandler); - connect(pass, &Pass::finishedOtpGenerate, this, &MainWindow::passOtpHandler); - connect(pass, &Pass::finishedInsert, this, &MainWindow::finishedInsert); - connect(pass, &Pass::finishedRemove, this, &MainWindow::passStoreChanged); - connect(pass, &Pass::finishedInit, this, &MainWindow::passStoreChanged); - connect(pass, &Pass::finishedMove, this, &MainWindow::passStoreChanged); - connect(pass, &Pass::finishedCopy, this, &MainWindow::passStoreChanged); - - connect(pass, &Pass::finishedGenerateGPGKeys, this, - &MainWindow::keyGenerationComplete); + // connect(pass, &Pass::startingExecuteWrapper, this, + // &MainWindow::executeWrapperStarted); + // connect(pass, &Pass::critical, this, &MainWindow::critical); + // connect(pass, &Pass::statusMsg, this, &MainWindow::showStatusMessage); + // connect(pass, &Pass::processErrorExit, this, + // &MainWindow::processErrorExit); connect(pass, &Pass::finishedGitInit, this, + // &MainWindow::passStoreChanged); + + // connect(pass, &Pass::finishedGitPull, this, &MainWindow::processFinished); + // connect(pass, &Pass::finishedGitPush, this, &MainWindow::processFinished); + //connect(pass, &Pass::finishedShow, this, &MainWindow::passShowHandler); +// connect(pass, &Pass::finishedOtpGenerate, this, &MainWindow::passOtpHandler); + // connect(pass, &Pass::finishedInsert, this, &MainWindow::finishedInsert); + // connect(pass, &Pass::finishedRemove, this, &MainWindow::passStoreChanged); + // connect(pass, &Pass::finishedInit, this, &MainWindow::passStoreChanged); + // connect(pass, &Pass::finishedMove, this, &MainWindow::passStoreChanged); + // connect(pass, &Pass::finishedCopy, this, &MainWindow::passStoreChanged); + + // connect(pass, &Pass::finishedGenerateGPGKeys, this, + // &MainWindow::onKeyGenerationComplete); } /** @@ -557,18 +571,19 @@ void MainWindow::executeWrapperStarted() { clearPanelTimer.stop(); } -void MainWindow::keyGenerationComplete(const QString &p_output, - const QString &p_errout) { - // qDebug() << p_output; - // qDebug() << p_errout; - if (0 != keygen) { - qDebug() << "Keygen Done"; - keygen->close(); - keygen = 0; - // TODO(annejan) some sanity checking ? - } - processFinished(p_output, p_errout); -} +// void MainWindow::onKeyGenerationComplete(const QString &p_output, +// const QString &p_errout) { +// // qDebug() << p_output; +// // qDebug() << p_errout; +// if (0 != keygen) { +// qDebug() << "Keygen Done"; +// keygen->close(); +// keygen = 0; +// // TODO(annejan) some sanity checking ? +// } + +// // processFinished(p_output, p_errout); +//} void MainWindow::passShowHandler(const QString &p_output) { QStringList templ = QtPassSettings::isUseTemplate() @@ -616,7 +631,6 @@ void MainWindow::passShowHandler(const QString &p_output) { clearPanelTimer.start(); } - DisplayInTextBrowser(output); setUiElementsEnabled(true); } @@ -628,66 +642,51 @@ void MainWindow::passOtpHandler(const QString &p_output) { if (QtPassSettings::isUseAutoclearPanel()) { clearPanelTimer.start(); } - enableUiElements(true); -} - -void MainWindow::passStoreChanged(const QString &p_out, const QString &p_err) { - processFinished(p_out, p_err); - doGitPush(); + setUiElementsEnabled(true); } -void MainWindow::doGitPush() { - if (QtPassSettings::isAutoPush()) - onPush(); -} +// void MainWindow::passStoreChanged(const QString &p_out, const QString &p_err) +// { +// processFinished(p_out, p_err); +// doGitPush(); +//} -void MainWindow::finishedInsert(const QString &p_output, - const QString &p_errout) { - processFinished(p_output, p_errout); - doGitPush(); - on_treeView_clicked(ui->treeView->currentIndex()); -} +// void MainWindow::doGitPush() { +// if (QtPassSettings::isAutoPush()) +// onPush(); +//} -void MainWindow::DisplayInTextBrowser(QString output, QString prefix, - QString postfix) { - output.replace(QRegExp("<"), "<"); - output.replace(QRegExp(">"), ">"); - output.replace(QRegExp(" "), " "); - - output.replace( - QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), - "\\1"); - output.replace(QRegExp("\n"), "
"); - output = prefix + output + postfix; - if (!ui->textBrowser->toPlainText().isEmpty()) - output = ui->textBrowser->toHtml() + output; - ui->textBrowser->setHtml(output); -} - -void MainWindow::processErrorExit(int exitCode, const QString &p_error) { - if (!p_error.isEmpty()) { - QString output; - QString error = p_error; - error.replace(QRegExp("<"), "<"); - error.replace(QRegExp(">"), ">"); - error.replace(QRegExp(" "), " "); - if (exitCode == 0) { - // https://github.com/IJHack/qtpass/issues/111 - output = "" + error + "
"; - } else { - output = "" + error + "
"; - } +// void MainWindow::finishedInsert(const QString &p_output, +// const QString &p_errout) { +// processFinished(p_output, p_errout); +// doGitPush(); +// on_treeView_clicked(ui->treeView->currentIndex()); +//} - output.replace( - QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), - "\\1"); - output.replace(QRegExp("\n"), "
"); - if (!ui->textBrowser->toPlainText().isEmpty()) - output = ui->textBrowser->toHtml() + output; - ui->textBrowser->setHtml(output); - } - setUiElementsEnabled(true); -} +// void MainWindow::processErrorExit(int exitCode, const QString &p_error) { +// if (!p_error.isEmpty()) { +// QString output; +// QString error = p_error; +// error.replace(QRegExp("<"), "<"); +// error.replace(QRegExp(">"), ">"); +// error.replace(QRegExp(" "), " "); +// if (exitCode == 0) { +// // https://github.com/IJHack/qtpass/issues/111 +// output = "" + error + "
"; +// } else { +// output = "" + error + "
"; +// } + +// output.replace( +// QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), +// "\\1"); +// output.replace(QRegExp("\n"), "
"); +// if (!ui->textBrowser->toPlainText().isEmpty()) +// output = ui->textBrowser->toHtml() + output; +// ui->textBrowser->setHtml(output); +// } +// setUiElementsEnabled(true); +//} /** * @brief MainWindow::clearClipboard remove clipboard contents. @@ -735,14 +734,14 @@ void MainWindow::clearPanel(bool notify) { * @param output stdout from a process * @param errout stderr from a process */ -void MainWindow::processFinished(const QString &p_output, - const QString &p_errout) { - DisplayInTextBrowser(p_output); - // Sometimes there is error output even with 0 exit code, which is - // assumed in this function - processErrorExit(0, p_errout); - setUiElementsEnabled(true); -} +// void MainWindow::processFinished(const QString &p_output, +// const QString &p_errout) { +// DisplayInTextBrowser(p_output); +// // Sometimes there is error output even with 0 exit code, which is +// // assumed in this function +// processErrorExit(0, p_errout); +// setUiElementsEnabled(true); +//} /** * @brief MainWindow::setUiElementsEnabled enable or disable the relevant UI @@ -783,7 +782,7 @@ void MainWindow::restoreWindow() { // * @brief MainWindow::processError something went wrong // * @param error // */ -//void MainWindow::processError(QProcess::ProcessError error) { +// void MainWindow::processError(QProcess::ProcessError error) { // QString errorString; // switch (error) { // case QProcess::FailedToStart: diff --git a/src/mainwindow.h b/src/mainwindow.h index 9f7b56ada..2340d0aac 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -3,6 +3,7 @@ #include "storemodel.h" +#include #include #include #include @@ -52,7 +53,16 @@ class MainWindow : public QMainWindow { void setTextTextBrowser(const QString &text); void setUiElementsEnabled(bool state); - void flashText(const QString &text, const bool isError); + void flashText(const QString &text, const bool isError, + const bool isHtml = false); + + const QModelIndex getCurrentTreeViewIndex(); + + QDialog *getKeygenDialog() { return this->keygen; } + void cleanKeygenDialog() { + this->keygen->close(); + this->keygen = 0; + } protected: void closeEvent(QCloseEvent *event); @@ -62,6 +72,7 @@ class MainWindow : public QMainWindow { signals: void uiEnabled(bool state); + void passShowHandlerFinished(QString output); public slots: void deselect(); @@ -71,6 +82,11 @@ public slots: void executeWrapperStarted(); void critical(QString, QString); void showStatusMessage(QString msg, int timeout); + void passShowHandler(const QString &); + void passOtpHandler(const QString &); + + void onPush(); + void on_treeView_clicked(const QModelIndex &index); private slots: void addPassword(); @@ -78,13 +94,10 @@ private slots: void onEdit(); void onDelete(); void onOtp(); - void onPush(); void onUpdate(bool block = false); void onUsers(); void onConfig(); - void on_treeView_clicked(const QModelIndex &index); void on_treeView_doubleClicked(const QModelIndex &index); - void processFinished(const QString &, const QString &); void clearPanel(bool notify = true); void on_lineEdit_textChanged(const QString &arg1); void on_lineEdit_returnPressed(); @@ -99,15 +112,6 @@ private slots: void passwordFromFileToClipboard(const QString &text); void startReencryptPath(); void endReencryptPath(); - void passShowHandler(const QString &); - void passOtpHandler(const QString &); - void passStoreChanged(const QString &, const QString &); - void doGitPush(); - - void processErrorExit(int exitCode, const QString &); - - void finishedInsert(const QString &, const QString &); - void keyGenerationComplete(const QString &p_output, const QString &p_errout); private: QtPass *m_qtPass; @@ -143,8 +147,6 @@ private slots: void reencryptPath(QString dir); void addToGridLayout(int position, const QString &field, const QString &value); - void DisplayInTextBrowser(QString toShow, QString prefix = QString(), - QString postfix = QString()); void connectPassSignalHandlers(Pass *pass); void updateGitButtonVisibility(); diff --git a/src/qtpass.cpp b/src/qtpass.cpp index 5260efa1c..72e960b5e 100644 --- a/src/qtpass.cpp +++ b/src/qtpass.cpp @@ -1,36 +1,42 @@ -#include "mainwindow.h" #include "qtpass.h" +#include "mainwindow.h" #include "qtpasssettings.h" +#include #include QtPass::QtPass() { - // This should connect Pass to MainWindow + // This should connect Pass to MainWindow - connectPassSignalHandlers(QtPassSettings::getRealPass()); - connectPassSignalHandlers(QtPassSettings::getImitatePass()); + connectPassSignalHandlers(QtPassSettings::getRealPass()); + connectPassSignalHandlers(QtPassSettings::getImitatePass()); } void QtPass::connectPassSignalHandlers(Pass *pass) { - connect(pass, &Pass::error, this, &QtPass::processError); - connect(pass, &Pass::startingExecuteWrapper, this, - &MainWindow::executeWrapperStarted); - connect(pass, &Pass::critical, this, &MainWindow::critical); - connect(pass, &Pass::statusMsg, this, &MainWindow::showStatusMessage); - connect(pass, &Pass::processErrorExit, this, &MainWindow::processErrorExit); - -// connect(pass, &Pass::finishedGitInit, this, &MainWindow::passStoreChanged); -// connect(pass, &Pass::finishedGitPull, this, &MainWindow::processFinished); -// connect(pass, &Pass::finishedGitPush, this, &MainWindow::processFinished); -// connect(pass, &Pass::finishedShow, this, &MainWindow::passShowHandler); -// connect(pass, &Pass::finishedInsert, this, &MainWindow::finishedInsert); -// connect(pass, &Pass::finishedRemove, this, &MainWindow::passStoreChanged); -// connect(pass, &Pass::finishedInit, this, &MainWindow::passStoreChanged); -// connect(pass, &Pass::finishedMove, this, &MainWindow::passStoreChanged); -// connect(pass, &Pass::finishedCopy, this, &MainWindow::passStoreChanged); - -// connect(pass, &Pass::finishedGenerateGPGKeys, this, -// &MainWindow::keyGenerationComplete); + connect(pass, &Pass::error, this, &QtPass::processError); + connect(pass, &Pass::processErrorExit, this, &QtPass::processErrorExit); + connect(pass, &Pass::startingExecuteWrapper, m_mainWindow, + &MainWindow::executeWrapperStarted); + connect(pass, &Pass::critical, m_mainWindow, &MainWindow::critical); + connect(pass, &Pass::statusMsg, m_mainWindow, &MainWindow::showStatusMessage); + connect(pass, &Pass::finishedShow, m_mainWindow, + &MainWindow::passShowHandler); + connect(pass, &Pass::finishedOtpGenerate, m_mainWindow, + &MainWindow::passOtpHandler); + connect(pass, &Pass::finishedGitInit, this, &QtPass::passStoreChanged); + connect(pass, &Pass::finishedGitPull, this, &QtPass::processFinished); + connect(pass, &Pass::finishedGitPush, this, &QtPass::processFinished); + connect(pass, &Pass::finishedInsert, this, &QtPass::finishedInsert); + connect(pass, &Pass::finishedRemove, this, &QtPass::passStoreChanged); + connect(pass, &Pass::finishedInit, this, &QtPass::passStoreChanged); + connect(pass, &Pass::finishedMove, this, &QtPass::passStoreChanged); + connect(pass, &Pass::finishedCopy, this, &QtPass::passStoreChanged); + + connect(pass, &Pass::finishedGenerateGPGKeys, this, + &QtPass::onKeyGenerationComplete); + + connect(m_mainWindow, &MainWindow::passShowHandlerFinished, this, + &QtPass::passShowHandlerFinished); } /** @@ -40,26 +46,115 @@ void QtPass::connectPassSignalHandlers(Pass *pass) { void QtPass::processError(QProcess::ProcessError error) { QString errorString; switch (error) { - case QProcess::FailedToStart: - errorString = tr("QProcess::FailedToStart"); - break; - case QProcess::Crashed: - errorString = tr("QProcess::Crashed"); - break; - case QProcess::Timedout: - errorString = tr("QProcess::Timedout"); - break; - case QProcess::ReadError: - errorString = tr("QProcess::ReadError"); - break; - case QProcess::WriteError: - errorString = tr("QProcess::WriteError"); - break; - case QProcess::UnknownError: - errorString = tr("QProcess::UnknownError"); - break; + case QProcess::FailedToStart: + errorString = tr("QProcess::FailedToStart"); + break; + case QProcess::Crashed: + errorString = tr("QProcess::Crashed"); + break; + case QProcess::Timedout: + errorString = tr("QProcess::Timedout"); + break; + case QProcess::ReadError: + errorString = tr("QProcess::ReadError"); + break; + case QProcess::WriteError: + errorString = tr("QProcess::WriteError"); + break; + case QProcess::UnknownError: + errorString = tr("QProcess::UnknownError"); + break; } m_mainWindow->flashText(errorString, true); m_mainWindow->setUiElementsEnabled(true); } + +void QtPass::processErrorExit(int exitCode, const QString &p_error) { + if (!p_error.isEmpty()) { + QString output; + QString error = p_error; + error.replace(QRegExp("<"), "<"); + error.replace(QRegExp(">"), ">"); + error.replace(QRegExp(" "), " "); + if (exitCode == 0) { + // https://github.com/IJHack/qtpass/issues/111 + output = "" + error + "
"; + } else { + output = "" + error + "
"; + } + + output.replace( + QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), + "\\1"); + output.replace(QRegExp("\n"), "
"); + + m_mainWindow->flashText(output, false, true); + } + + m_mainWindow->setUiElementsEnabled(true); +} + +/** + * @brief QtPass::processFinished background process has finished + * @param exitCode + * @param exitStatus + * @param output stdout from a process + * @param errout stderr from a process + */ +void QtPass::processFinished(const QString &p_output, const QString &p_errout) { + showInTextBrowser(p_output); + // Sometimes there is error output even with 0 exit code, which is + // assumed in this function + processErrorExit(0, p_errout); + + m_mainWindow->setUiElementsEnabled(true); +} + +void QtPass::passStoreChanged(const QString &p_out, const QString &p_err) { + processFinished(p_out, p_err); + doGitPush(); +} + +void QtPass::finishedInsert(const QString &p_output, const QString &p_errout) { + processFinished(p_output, p_errout); + doGitPush(); + m_mainWindow->on_treeView_clicked(m_mainWindow->getCurrentTreeViewIndex()); +} + +void QtPass::doGitPush() { + if (QtPassSettings::isAutoPush()) + m_mainWindow->onPush(); +} + +void QtPass::onKeyGenerationComplete(const QString &p_output, + const QString &p_errout) { + // qDebug() << p_output; + // qDebug() << p_errout; + if (0 != m_mainWindow->getKeygenDialog()) { + qDebug() << "Keygen Done"; + m_mainWindow->cleanKeygenDialog(); + // TODO(annejan) some sanity checking ? + } + + this->processFinished(p_output, p_errout); +} + +void QtPass::passShowHandlerFinished(QString output) { + showInTextBrowser(output); +} + +void QtPass::showInTextBrowser(QString output, QString prefix, + QString postfix) { + output.replace(QRegExp("<"), "<"); + output.replace(QRegExp(">"), ">"); + output.replace(QRegExp(" "), " "); + + output.replace( + QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), + "\\1"); + output.replace(QRegExp("\n"), "
"); + output = prefix + output + postfix; + + m_mainWindow->flashText(output, false, true); +} diff --git a/src/qtpass.h b/src/qtpass.h index 8686d0c5a..d6e5cef24 100644 --- a/src/qtpass.h +++ b/src/qtpass.h @@ -25,7 +25,19 @@ public slots: private slots: void processError(QProcess::ProcessError); + void processErrorExit(int exitCode, const QString &); + void processFinished(const QString &, const QString &); + void passStoreChanged(const QString &, const QString &); + void passShowHandlerFinished(QString output); + + void finishedInsert(const QString &, const QString &); + void onKeyGenerationComplete(const QString &p_output, + const QString &p_errout); + + void doGitPush(); + void showInTextBrowser(QString toShow, QString prefix = QString(), + QString postfix = QString()); }; #endif // QTPASS_H