Merge branch 'master' of https://github.com/liranbg/jceAverageCalculator

2014-08-27 13:49:22 +03:00 · 2014-08-27 13:49:22 +03:00 · 1a3813d858
commit 1a3813d858
parent b39a5a434a 6769a160a6
9 changed files with 545 additions and 32 deletions
--- a/jceGrade.pro
+++ b/jceGrade.pro
@ -41,7 +41,8 @@ HEADERS  +=     main/coursestablemanager.h \
    src/data/savedata.h \


-
+TRANSLATIONS = jce_en.ts \
+               jce_he.ts

 FORMS    += \
    main/mainscreen.ui
--- a/jce_en.qm
+++ b/jce_en.qm
--- a/jce_en.ts
+++ b/jce_en.ts
@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>MainScreen</name>
+    <message>
+        <location filename="main/mainscreen.ui" line="20"/>
+        <source>JCE Avg Calculator</source>
+        <translation>JCE Manager</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="86"/>
+        <location filename="main/mainscreen.ui" line="193"/>
+        <source>Login</source>
+        <translation>Login</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="177"/>
+        <source>Keep login</source>
+        <translation>Keep login</translation>
+    </message>
+    <message>
+        <source>&lt;color=#000000&gt;Username</source>
+        <translation type="vanished">Usernameasdfasdg</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="234"/>
+        <location filename="main/mainscreen.cpp" line="11"/>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="260"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="306"/>
+        <source>Courses</source>
+        <translation>Grade Table</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="343"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Get your grades&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>Get Your Grades</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="346"/>
+        <source>Add</source>
+        <translation>Add</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="353"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Clear table&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>Clear Table</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="356"/>
+        <source>Clear</source>
+        <translation>Clear</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="380"/>
+        <source>Average:</source>
+        <translation>Average:</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="428"/>
+        <source>Settings</source>
+        <translation>Sattings</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="474"/>
+        <source>Semester</source>
+        <translation>Senester</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="497"/>
+        <source>Year</source>
+        <translation>Year</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="530"/>
+        <source>From</source>
+        <translation>From</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="549"/>
+        <source>To</source>
+        <translation>To</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="655"/>
+        <source>Only influence Courses</source>
+        <translation>Only influence Courses</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="683"/>
+        <source>&amp;About</source>
+        <translation>&amp;About</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="707"/>
+        <source>Credits</source>
+        <translation>Credits</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="712"/>
+        <source>Exit</source>
+        <translation>Exit</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.ui" line="717"/>
+        <source>How-To</source>
+        <translation>How-To</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.cpp" line="79"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="main/mainscreen.cpp" line="79"/>
+        <source>Not Connected</source>
+        <translation>Not Connected</translation>
+    </message>
+
+    <message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP1</source>
+<translation>A tiny Application to calculate your grades average.</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP2</source>
+<translation>This software is licensed under Qt5's </translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP3</source>
+<translation>The source code is available at github:</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP4</source>
+<translation>This front end is Powered by</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>DevBy</source>
+<translation>Developed By</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Liran</source>
+<translation>Liran Ben Gida</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Sagi</source>
+<translation>Sagi Dayan</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Nadav</source>
+<translation>Nadav Luzzato</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Tnks</source>
+<translation>Thanks to</translation>
+</message>
+
+
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Code</source>
+<translation>Code</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Name</source>
+<translation>Course</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Type</source>
+<translation>Type</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Points</source>
+<translation>Points</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Hours</source>
+<translation>Weekly Hours</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Grade</source>
+<translation>Grade</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Additions</source>
+<translation>Additions</translation>
+</message>
+
+
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP1</source>
+<translation>Insert your username and password correctly</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP2</source>
+<translation>Login and wait for the ball in the status (buttom) bar to become Green</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP3</source>
+<translation>Check the Settings to select your date Interval</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP4</source>
+<translation>Press Courses tab and then press the Add button and wait until courses will be loaded into the table</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP5</source>
+<translation>Change the once of the grade cell and see your average is changing.</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP6</source>
+<translation>Tip: Need to change Date interval? in Courses tab click Clean, then change the date interval then hit the Add button again! :-)</translation>
+</message>
+
+
+</context>
+
+</TS>
--- a/jce_he.qm
+++ b/jce_he.qm
--- a/jce_he.ts
+++ b/jce_he.ts
@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="he_IL">
+<context>
+<name>MainScreen</name>
+<message>
+<location filename="main/mainscreen.ui" line="20"/>
+<source>JCE Avg Calculator</source>
+<translation>JCE Manager</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="86"/>
+<location filename="main/mainscreen.ui" line="193"/>
+<source>Login</source>
+<translation>התחבר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="177"/>
+<source>Keep login</source>
+<translation>שמור פרטים</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="234"/>
+<location filename="main/mainscreen.cpp" line="11"/>
+<source>Username</source>
+<translation>שם משתמש</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="260"/>
+<source>Password</source>
+<translation>סיסמה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="306"/>
+<source>Courses</source>
+<translation>גיליון ציונים</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="343"/>
+<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Get your grades&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+<translation>קבל את הציונים שלך</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="346"/>
+<source>Add</source>
+<translation>הוספה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="353"/>
+<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Clear table&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+<translation>נקה טבלה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="356"/>
+<source>Clear</source>
+<translation>נקה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="380"/>
+<source>Average:</source>
+<translation>ממוצע:</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="428"/>
+<source>Settings</source>
+<translation>הגדרות</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="474"/>
+<source>Semester</source>
+<translation>סמסטר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="497"/>
+<source>Year</source>
+<translation>שנה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="530"/>
+<source>From</source>
+<translation>מסמסטר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="549"/>
+<source>To</source>
+<translation>לסמסטר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="655"/>
+<source>Only influence Courses</source>
+<translation>רק קורסים בעלי השפעה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="683"/>
+<source>&amp;About</source>
+<translation>&amp;אודות</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="707"/>
+<source>Credits</source>
+<translation>אודות</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="712"/>
+<source>Exit</source>
+<translation>יציאה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.ui" line="717"/>
+<source>How-To</source>
+<translation>עזרה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="79"/>
+<source>Error</source>
+<translation>שגיאה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="79"/>
+<source>Not Connected</source>
+<translation>לא התחבר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="218"/>
+<source>Connecting</source>
+<translation>מנסה להתחבר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="222"/>
+<source>Connected</source>
+<translation>מחובר</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Disconnected</source>
+<translation>מנותק</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP1</source>
+<translation>אפליקציה קטנה לחישוב ציונים</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP2</source>
+<translation>רישיון השימוש בתוכנה ובקוד הפתוח רשום תחת </translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP3</source>
+<translation>כל קוד המקור של התוכנה נמצא בגיטהאב:</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>CREDITS-ROOL-UP4</source>
+<translation>התוכנה פועלת בעזרת המנוע</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>DevBy</source>
+<translation>פותח ע"י</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Liran</source>
+<translation>לירן בן גידה</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Sagi</source>
+<translation>שגיא דיין</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Nadav</source>
+<translation>נדב לוצטו</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="226"/>
+<source>Tnks</source>
+<translation>תודה רבה ל</translation>
+</message>
+
+
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Code</source>
+<translation>קוד קורס</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Name</source>
+<translation>קורס</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Type</source>
+<translation>סוג</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Points</source>
+<translation>נקודות זכות</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Hours</source>
+<translation>שעות שבועיות</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Grade</source>
+<translation>ציון</translation>
+</message>
+<message>
+<location filename="main/coursestablemanager.cpp" line="15"/>
+<source>Additions</source>
+<translation>הערות</translation>
+</message>
+
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP1</source>
+<translation>הכנס את שם המשתמש והסיסמה כמו שצריך</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP2</source>
+<translation>לחץ התחבר והמתן על שהתוכנה תתחבר, עיגול ירוק למטה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP3</source>
+<translation>הכנס להגדרות כדי לבחור את טווח הגיליון</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP4</source>
+<translation>לחץ על העמוד של גיליון הציונים ולחץ הוספהת המתן עד שהציונים יופיעו בטבלה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP5</source>
+<translation>שנה ושחק עם הציונים כדי לראות את הממוצע משתנה</translation>
+</message>
+<message>
+<location filename="main/mainscreen.cpp" line="276"/>
+<source>HELP6</source>
+<translation>טיפ: רוצה לשנות את תקופת הזמן? לחץ על  נקה, ולאחר מכן שנה את תקופת הזמן ולחץ על הוספה שוב! :-)</translation>
+</message>
+
+
+
+</context>
+</TS>
--- a/main/coursestablemanager.cpp
+++ b/main/coursestablemanager.cpp
@ -12,13 +12,12 @@ coursesTableManager::coursesTableManager(QTableWidget *ptr, user *usrPtr)
    courseTBL->setRowCount(0);
    courseTBL->setColumnCount(COURSE_FIELDS);
    QStringList mz;
-    mz << "Serial" << "Name" << "Type" << "Points" << "Hours" << "Grade" << "Additions";
+    mz << QObject::tr("Code") << QObject::tr("Name") << QObject::tr("Type") << QObject::tr("Points") << QObject::tr("Hours") << QObject::tr("Grade") << QObject::tr("Additions");
    courseTBL->setHorizontalHeaderLabels(mz);
    courseTBL->verticalHeader()->setVisible(true);
    courseTBL->setSelectionMode(QAbstractItemView::SingleSelection);
    courseTBL->setShowGrid(true);
    courseTBL->setStyleSheet("QTableView {selection-background-color: red;}");
-
 }

 coursesTableManager::~coursesTableManager()
--- a/main/main.cpp
+++ b/main/main.cpp
@ -1,9 +1,15 @@
 #include "mainscreen.h"
 #include <QApplication>
+#include <QTranslator>
+#include <QDebug>

 int main(int argc, char *argv[])
 {
    QApplication a(argc, argv);
+    QTranslator translator;
+    QString locale = QLocale::system().name();
+    translator.load("jce_"+locale , a.applicationDirPath());
+    a.installTranslator(&translator);
    MainScreen w;
    w.show();

--- a/main/mainscreen.cpp
+++ b/main/mainscreen.cpp
@ -8,6 +8,7 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr

    this->setFixedSize(this->size()); //main not resizeable

+
    //Login Tab
    ui->pswdLineEdit->setEchoMode((QLineEdit::Password));

@ -228,15 +229,15 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)

    case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:
        iconPix.load(":/icons/blueStatusIcon.png");
-        statusLabel->setText("Connecting");
+        statusLabel->setText(tr("Connecting"));
        break;
    case jceLogin::jceStatus::JCE_YOU_ARE_IN:
        iconPix.load(":/icons/greenStatusIcon.png");
-        statusLabel->setText("Connected");
+        statusLabel->setText(tr("Connected"));
        break;
    default:
        iconPix.load(":/icons/redStatusIcon.png");
-        statusLabel->setText("Disconnected");
+        statusLabel->setText(tr("Disconnected"));
        break;
    }
    ButtomStatusLabel->setPixmap(iconPix);
@ -245,19 +246,19 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
 }
 void MainScreen::on_actionCredits_triggered()
 {
-    QMessageBox::about(this, "About", "A tiny Application to calculate your grades average. v1.0 <br><br>"
-                       "This software is licensed under Qt5's <br>GNU LESSER GENERAL PUBLIC LICENSE V2<br>"
-                       "The source code is available at github:<br>"
+    QMessageBox::about(this, "About", tr("CREDITS-ROOL-UP1")  + " v1.0<br><br>"
+                       + tr("CREDITS-ROOL-UP2")+"<br>GNU LESSER GENERAL PUBLIC LICENSE V2<br>"
+                       + tr("CREDITS-ROOL-UP3")+"<br>"
                       "<a href='https://github.com/liranbg/jceAverageCalculator'>jceAverageCalculator Repository</a>"
-                       "<br><br>This front end is Powered by <a href='https://github.com/liranbg/jceConnection'>Jce Connection</a><br><br>"
-                       "Developed by: "
+                       "<br><br>"+tr("CREDITS-ROOL-UP4")+"<a href='https://github.com/liranbg/jceConnection'> Jce Connection</a><br><br>"
+                       +tr("DevBy")+":"
                       "<ul>"
-                       "<li><a href='mailto:liranbg@gmail.com'>Liran Ben Gida</a></li>"
-                       "<li><a href='mailto:sagidayan@gmail.com'>Sagi Dayan</a></li>"
+                       "<li><a href='mailto:liranbg@gmail.com'>"+tr("Liran")+"</a></li>"
+                       "<li><a href='mailto:sagidayan@gmail.com'>"+tr("Sagi")+"</a></li>"
                       "</ul>"
-                       "Thanks to: "
+                       +tr("Tnks")+ "... :"
                       "<ul>"
-                       "<li><a href='mailto:nadav2051@gmail.com'>Nadav Luzzato</a></li>"
+                       "<li><a href='mailto:nadav2051@gmail.com'>"+tr("Nadav")+"</a></li>"
                       "</ul>");
 }

@ -275,22 +276,13 @@ void MainScreen::on_actionHow_To_triggered()
    QMessageBox::information(this,"How To",
                             "<b>How To..</b>"
                             "<ul>"
-                             "<br><li>Insert your username and password correctly</li>"
-                             "<br><li>Login and wait for the ball in the status (buttom) bar to become Green</li>"
-                             "<br><li>Check <b>Settings</b> to select your date Interval</li>"
-                             "<br><li>Press <b>Courses</b> tab and then press <u>Add</u> button and wait until courses will be loaded into the table</li>"
-                             "<br><li>Change the once of the grade cell and see your average is changing. </li>"
-                             "<br><br>Tip: Need to change Date interval? in Courses tab click <u>Clean</u>, then change the date interval then hit <u>Add</u> again! :-)"
-                             "</ul>"
-                             "<br><br><b>הסבר</b>"
-                             "<ul>"
-                             "<br><li>הכנס את שם המשתמש והסיסמה שלך כנדרש</li>"
-                             "<br><li>לחץ התחבר והמתן מספר שניות עד להופעת כדור ירוק בתחתית המסך</li>"
-                             "<br><li>בדוק <b>הגדרות</b> כדי לבדוק את תקופת הזמן אותם תרצה להציג</li>"
-                             "<br><li> לחץ על <b>Courses</b> ולאחר מכן על כפתור <u>Add</u> והמתן מספר שניות עד להופעת הקורסים בטבלה</li>"
-                             "<br><li>כעת ניתן לשנות ערכים בתא הציונים ולראות את ממוצע הציונים בהתאם </li>"
-                             "<br><br>טיפ: רוצה לשנות את תקופת הזמן? לחץ על  <u>Clean</u> , ולאחר מכן שנה את תקופת הזמן ולחץ על <u>Add</u> שוב! :-)"
-                             " </ul>");
+                             "<br><li>"+tr("HELP1")+"</li>"
+                             "<br><li>"+tr("HELP2")+"</li>"
+                             "<br><li>"+tr("HELP3")+"</li>"
+                             "<br><li>"+tr("HELP4")+"</li>"
+                             "<br><li>"+tr("HELP5")+"</li>"
+                             "<br><br>"+tr("HELP6")+
+                             "</ul>");

 }

--- a/main/mainscreen.ui
+++ b/main/mainscreen.ui
@ -231,7 +231,7 @@ font-size: 15px;
                  </sizepolicy>
                 </property>
                 <property name="text">
-                  <string>&lt;color=#000000&gt;Username</string>
+                  <string>Username</string>
                 </property>
                 <property name="textFormat">
                  <enum>Qt::RichText</enum>