From 8259cd9a6209836b3e50f7329463e1bd817beb7c Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 17 Jul 2018 20:39:01 +0000 Subject: [PATCH] 2018-07-17 Fred Gleason * Cleaned up SQL quieries in 'rdlogin/' to ensure UTF-8 compatibility. --- ChangeLog | 3 +++ rdlogin/rdlogin.cpp | 6 +----- rdlogin/rdlogin_cs.ts | 6 +++++- rdlogin/rdlogin_de.ts | 6 +++++- rdlogin/rdlogin_es.ts | 6 +++++- rdlogin/rdlogin_fr.ts | 8 ++++---- rdlogin/rdlogin_nb.ts | 6 +++++- rdlogin/rdlogin_nn.ts | 6 +++++- rdlogin/rdlogin_pt_BR.ts | 6 +++++- 9 files changed, 38 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8a166d6..886a4036 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17152,3 +17152,6 @@ 2018-07-17 Fred Gleason * Cleaned up SQL quieries in 'rdlogedit/' to ensure UTF-8 compatibility. +2018-07-17 Fred Gleason + * Cleaned up SQL quieries in 'rdlogin/' to ensure UTF-8 + compatibility. diff --git a/rdlogin/rdlogin.cpp b/rdlogin/rdlogin.cpp index 1701932f..cb0f81e7 100644 --- a/rdlogin/rdlogin.cpp +++ b/rdlogin/rdlogin.cpp @@ -225,11 +225,7 @@ void MainWidget::connectedData(bool state) void MainWidget::userData() { - QString str; - - str=QString(tr("Current User:")); - login_label->setText(QString().sprintf("%s %s",(const char *)str, - (const char *)rda->ripc()->user())); + login_label->setText(tr("Current User")+": "+rda->ripc()->user()); resizeEvent(NULL); } diff --git a/rdlogin/rdlogin_cs.ts b/rdlogin/rdlogin_cs.ts index f6b30a99..f8fd2569 100644 --- a/rdlogin/rdlogin_cs.ts +++ b/rdlogin/rdlogin_cs.ts @@ -41,7 +41,7 @@ uživatel Current User: - Nynější uživatel: + Nynější uživatel: RDLogin @@ -63,5 +63,9 @@ uživatel Unknown command option + + Current User + + diff --git a/rdlogin/rdlogin_de.ts b/rdlogin/rdlogin_de.ts index 6a606f52..222675e0 100644 --- a/rdlogin/rdlogin_de.ts +++ b/rdlogin/rdlogin_de.ts @@ -40,7 +40,7 @@ User Current User: - Derzeitiger Benutzer: + Derzeitiger Benutzer: RDLogin @@ -62,5 +62,9 @@ User Unknown command option + + Current User + + diff --git a/rdlogin/rdlogin_es.ts b/rdlogin/rdlogin_es.ts index 620989dc..cb7910b9 100644 --- a/rdlogin/rdlogin_es.ts +++ b/rdlogin/rdlogin_es.ts @@ -11,7 +11,7 @@ Current User: - Usuario actual: + Usuario actual: RDLogin @@ -63,5 +63,9 @@ User Unknown command option + + Current User + + diff --git a/rdlogin/rdlogin_fr.ts b/rdlogin/rdlogin_fr.ts index 81f67cb0..ef85a9a6 100644 --- a/rdlogin/rdlogin_fr.ts +++ b/rdlogin/rdlogin_fr.ts @@ -30,10 +30,6 @@ User &Cancel - - Current User: - - RDLogin @@ -50,5 +46,9 @@ User Unknown command option + + Current User + + diff --git a/rdlogin/rdlogin_nb.ts b/rdlogin/rdlogin_nb.ts index 7a44f1e9..06652e03 100644 --- a/rdlogin/rdlogin_nb.ts +++ b/rdlogin/rdlogin_nb.ts @@ -41,7 +41,7 @@ brukar Current User: - Brukarnamn no: + Brukarnamn no: RDLogin @@ -63,5 +63,9 @@ brukar Unknown command option + + Current User + + diff --git a/rdlogin/rdlogin_nn.ts b/rdlogin/rdlogin_nn.ts index 7a44f1e9..06652e03 100644 --- a/rdlogin/rdlogin_nn.ts +++ b/rdlogin/rdlogin_nn.ts @@ -41,7 +41,7 @@ brukar Current User: - Brukarnamn no: + Brukarnamn no: RDLogin @@ -63,5 +63,9 @@ brukar Unknown command option + + Current User + + diff --git a/rdlogin/rdlogin_pt_BR.ts b/rdlogin/rdlogin_pt_BR.ts index bc8aa148..a080b9c5 100644 --- a/rdlogin/rdlogin_pt_BR.ts +++ b/rdlogin/rdlogin_pt_BR.ts @@ -42,7 +42,7 @@ Padrão Current User: - Usuário Atual: + Usuário Atual: RDLogin @@ -64,5 +64,9 @@ Padrão Unknown command option + + Current User + +