diff options
25 files changed, 59 insertions, 54 deletions
diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 959cda9b..4767fa91 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -648,7 +648,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation type="unfinished"></translation> </message> @@ -722,7 +722,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts index 2301a310..55503247 100644 --- a/localization/localization_ca.ts +++ b/localization/localization_ca.ts @@ -695,7 +695,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Benvingut a QtPass %1</translation> </message> @@ -902,7 +902,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Generació del parell de claus GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>S'ha canviat el perfil a %1</translation> </message> diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index afedb055..6404d8cb 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -677,7 +677,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Vítejte v QtPass %1</translation> </message> @@ -880,7 +880,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Generování páru GPG klíčů</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profil změněn na %1</translation> </message> diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 0d80bfe2..5372aa96 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -665,7 +665,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-620"/> + <location filename="../src/mainwindow.cpp" line="-621"/> <location line="+12"/> <source>Updating password-store</source> <translation>Passwort Speicher aktualisieren</translation> @@ -680,7 +680,7 @@ p, li { white-space: pre-wrap; } <translation>Sind Sie sicher, dass Sie %1%2 löschen wollen</translation> </message> <message> - <location line="+244"/> + <location line="+245"/> <source>Open folder with file manager</source> <translation>Öffnen Sie den Ordner mit dem Dateimanager</translation> </message> @@ -815,7 +815,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/mainwindow.ui"/> - <location filename="../src/mainwindow.cpp" line="+460"/> + <location filename="../src/mainwindow.cpp" line="+461"/> <source>Add folder</source> <translation>Ordner hinzufügen</translation> </message> @@ -826,7 +826,7 @@ p, li { white-space: pre-wrap; } <translation>Passwort hinzufügen</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-710"/> + <location filename="../src/mainwindow.cpp" line="-711"/> <source>Welcome to QtPass %1</source> <translation>Willkommen bei QtPass %1</translation> </message> @@ -898,7 +898,7 @@ Neues Passwort-Datei: <translation type="vanished">GPG Schlüssel-Paar wird generiert</translation> </message> <message> - <location line="+127"/> + <location line="+128"/> <source>Profile changed to %1</source> <translation>Profil geändert zu %1</translation> </message> diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 9b1d3e74..86c27fb9 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -664,7 +664,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-620"/> + <location filename="../src/mainwindow.cpp" line="-621"/> <location line="+12"/> <source>Updating password-store</source> <translation>Password Store aktualisieren</translation> @@ -679,7 +679,7 @@ p, li { white-space: pre-wrap; } <translation>Sind Sie sicher, dass Sie %1%2 löschen wollen?</translation> </message> <message> - <location line="+244"/> + <location line="+245"/> <source>Open folder with file manager</source> <translation type="unfinished"></translation> </message> @@ -810,7 +810,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/mainwindow.ui"/> - <location filename="../src/mainwindow.cpp" line="+460"/> + <location filename="../src/mainwindow.cpp" line="+461"/> <source>Add folder</source> <translation>Ordner hinzufügen</translation> </message> @@ -821,7 +821,7 @@ p, li { white-space: pre-wrap; } <translation>Passwort hinzufügen</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-710"/> + <location filename="../src/mainwindow.cpp" line="-711"/> <source>Welcome to QtPass %1</source> <translation>Wilkommen bei QtPass %1</translation> </message> @@ -893,7 +893,7 @@ Neues Passwort-Datei: <translation type="vanished">GPG Schlüssel-Paar wird generiert</translation> </message> <message> - <location line="+127"/> + <location line="+128"/> <source>Profile changed to %1</source> <translation>Profil geändert zu %1</translation> </message> diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index 9249650f..e930b3db 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -617,7 +617,7 @@ Expire-Date: 0 <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index 5c5bbdc3..98f2ea60 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -706,7 +706,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Welcome to QtPass %1</translation> </message> @@ -913,7 +913,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Generating GPG key pair</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profile changed to %1</translation> </message> diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts index e12df8ac..8900b3e6 100644 --- a/localization/localization_en_US.ts +++ b/localization/localization_en_US.ts @@ -706,7 +706,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Welcome to QtPass %1</translation> </message> @@ -913,7 +913,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Generating GPG key pair</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profile changed to %1</translation> </message> diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts index 933ad4e4..d1590c2d 100644 --- a/localization/localization_es_ES.ts +++ b/localization/localization_es_ES.ts @@ -657,7 +657,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-620"/> + <location filename="../src/mainwindow.cpp" line="-621"/> <location line="+12"/> <source>Updating password-store</source> <translation>Actualizando password-store</translation> @@ -821,7 +821,7 @@ p, li { white-space: pre-wrap; } <translation>Añadir contraseña</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-710"/> + <location filename="../src/mainwindow.cpp" line="-711"/> <source>Welcome to QtPass %1</source> <translation>Bienvenido a QtPass %1</translation> </message> @@ -875,7 +875,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Generar par de claves GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Perfil cambiado a %1</translation> </message> diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts index a2b55937..8042b9d9 100644 --- a/localization/localization_fr_BE.ts +++ b/localization/localization_fr_BE.ts @@ -677,7 +677,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Bienvenue sur QtPass %1</translation> </message> @@ -880,7 +880,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Génération d'une paire de clés GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profil changé vers %1</translation> </message> diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts index 4f143259..1f90dd25 100644 --- a/localization/localization_fr_FR.ts +++ b/localization/localization_fr_FR.ts @@ -695,7 +695,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Bienvenue sur QtPass %1</translation> </message> @@ -913,7 +913,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Génération d'une paire de clés GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profil sélectionné : %1</translation> </message> diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts index e6bde19d..31cb34cc 100644 --- a/localization/localization_fr_LU.ts +++ b/localization/localization_fr_LU.ts @@ -677,7 +677,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Bienvenue sur QtPass %1</translation> </message> @@ -880,7 +880,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Génération d'une paire de clés GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profil changé vers %1</translation> </message> diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts index 49e4948e..974e330f 100644 --- a/localization/localization_gl_ES.ts +++ b/localization/localization_gl_ES.ts @@ -755,7 +755,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-620"/> + <location filename="../src/mainwindow.cpp" line="-621"/> <location line="+12"/> <source>Updating password-store</source> <translation>Actualizando password-store</translation> @@ -861,7 +861,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts index af67bccb..f1989eb4 100644 --- a/localization/localization_he_IL.ts +++ b/localization/localization_he_IL.ts @@ -648,7 +648,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation type="unfinished"></translation> </message> @@ -722,7 +722,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts index baed8efb..2e987dce 100644 --- a/localization/localization_hu_HU.ts +++ b/localization/localization_hu_HU.ts @@ -652,7 +652,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-620"/> + <location filename="../src/mainwindow.cpp" line="-621"/> <location line="+12"/> <source>Updating password-store</source> <translation>Jelszó-tároló frissítése</translation> @@ -754,7 +754,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index 43180643..1d1cd87e 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -717,7 +717,7 @@ p, li { white-space: pre-wrap; } <translation>Cerca Password</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Benvenuto in QtPass %1</translation> </message> @@ -924,7 +924,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Generando una coppia di chiavi GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profilo cambiato in %1</translation> </message> diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts index 4e9bc3c5..24808739 100644 --- a/localization/localization_lb_LU.ts +++ b/localization/localization_lb_LU.ts @@ -648,7 +648,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation type="unfinished"></translation> </message> @@ -722,7 +722,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_nl.ts b/localization/localization_nl.ts index d639a76e..8db9eff9 100644 --- a/localization/localization_nl.ts +++ b/localization/localization_nl.ts @@ -700,7 +700,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Welkom bij QtPass %1</translation> </message> @@ -906,7 +906,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Nieuw GPG-sleutelpaar genereren</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profiel veranderd naar %1</translation> </message> diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts index 27c68408..2037a61a 100644 --- a/localization/localization_pl_PL.ts +++ b/localization/localization_pl_PL.ts @@ -617,7 +617,7 @@ Expire-Date: 0 <translation type="unfinished"></translation> </message> <message> - <location line="+117"/> + <location line="+118"/> <source>Profile changed to %1</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_pt_PT.ts b/localization/localization_pt_PT.ts index f6e3f751..2d9e30ba 100644 --- a/localization/localization_pt_PT.ts +++ b/localization/localization_pt_PT.ts @@ -675,7 +675,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>Bem-vindo ao QtPass %1</translation> </message> @@ -867,7 +867,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Gerar par de chaves GPG</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Perfil mudou para %1</translation> </message> diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts index 099a3d3a..6ad10335 100644 --- a/localization/localization_ru_RU.ts +++ b/localization/localization_ru_RU.ts @@ -678,7 +678,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>QtPass %1 приветствует Вас</translation> </message> @@ -713,7 +713,7 @@ p, li { white-space: pre-wrap; } <translation>Обновление password-store</translation> </message> <message> - <location line="+605"/> + <location line="+606"/> <source>Open folder with file manager</source> <translation type="unfinished"></translation> </message> @@ -869,7 +869,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Невозможно изменить содержимое</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-294"/> + <location filename="../src/mainwindow.cpp" line="-295"/> <source>New password file: (Will be placed in %1 )</source> <translation>Новый файл для пароля: diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts index 9438b4c3..365c0b17 100644 --- a/localization/localization_sv_SE.ts +++ b/localization/localization_sv_SE.ts @@ -658,7 +658,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-620"/> + <location filename="../src/mainwindow.cpp" line="-621"/> <location line="+12"/> <source>Updating password-store</source> <translation>Uppdaterar lösenordsutrymmet</translation> @@ -782,7 +782,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/mainwindow.ui"/> - <location filename="../src/mainwindow.cpp" line="+460"/> + <location filename="../src/mainwindow.cpp" line="+461"/> <source>Add folder</source> <translation>Lägg till mapp</translation> </message> @@ -798,7 +798,7 @@ p, li { white-space: pre-wrap; } <translation>Lägg till lösenord</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-710"/> + <location filename="../src/mainwindow.cpp" line="-711"/> <source>Welcome to QtPass %1</source> <translation>Välkommen till QtPass %1</translation> </message> @@ -852,7 +852,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">Skapar GPG nyckelpar</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>Profil ändrad till %1</translation> </message> diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts index 7cfc4165..d68128ed 100644 --- a/localization/localization_zh_CN.ts +++ b/localization/localization_zh_CN.ts @@ -676,7 +676,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">qtpass</translation> </message> <message> - <location filename="../src/mainwindow.cpp" line="-711"/> + <location filename="../src/mainwindow.cpp" line="-712"/> <source>Welcome to QtPass %1</source> <translation>欢迎使用 QtPass %1</translation> </message> @@ -879,7 +879,7 @@ p, li { white-space: pre-wrap; } <translation type="vanished">正在生成 GPG 密钥对</translation> </message> <message> - <location line="+118"/> + <location line="+119"/> <source>Profile changed to %1</source> <translation>用户已更改为 %1</translation> </message> diff --git a/main/main.cpp b/main/main.cpp index fefe570f..907aa9e2 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -92,6 +92,10 @@ int main(int argc, char *argv[]) { &MainWindow::messageAvailable); #endif +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) + QGuiApplication::setDesktopFileName("qtpass.desktop"); +#endif + w.show(); return SingleApplication::exec(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 25ed5221..c794a521 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -750,6 +750,7 @@ void MainWindow::updateProfileBox() { if (!i.key().isEmpty()) ui->profileBox->addItem(i.key()); } + ui->profileBox->model()->sort(0); } int index = ui->profileBox->findText(QtPassSettings::getProfile()); if (index != -1) // -1 for not found |