diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/sankore_ar.ts index 2cb1f7b1..74fe4073 100644 --- a/resources/i18n/sankore_ar.ts +++ b/resources/i18n/sankore_ar.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/sankore_da.ts index 0cddc24e..4d380b25 100644 --- a/resources/i18n/sankore_da.ts +++ b/resources/i18n/sankore_da.ts @@ -1854,11 +1854,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/sankore_de.ts index cebd0c7e..96e093e7 100644 --- a/resources/i18n/sankore_de.ts +++ b/resources/i18n/sankore_de.ts @@ -1854,11 +1854,11 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/sankore_en.ts index 2b349206..19d36ecd 100644 --- a/resources/i18n/sankore_en.ts +++ b/resources/i18n/sankore_en.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/sankore_en_UK.ts index d9739ce0..c4eb8cbb 100644 --- a/resources/i18n/sankore_en_UK.ts +++ b/resources/i18n/sankore_en_UK.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/sankore_es.ts index 0804a481..3ddd9826 100644 --- a/resources/i18n/sankore_es.ts +++ b/resources/i18n/sankore_es.ts @@ -1854,11 +1854,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 816e81b8..4d57becf 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -1856,11 +1856,11 @@ Voulez-vous ignorer les erreurs pour ce serveur? Action %0 - Enseignant + Teacher - Élève + Student @@ -1967,7 +1967,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Remind me later - + diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index 816e81b8..4d57becf 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -1856,11 +1856,11 @@ Voulez-vous ignorer les erreurs pour ce serveur? Action %0 - Enseignant + Teacher - Élève + Student @@ -1967,7 +1967,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Remind me later - + diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/sankore_it.ts index 825bcc24..73e9cee4 100644 --- a/resources/i18n/sankore_it.ts +++ b/resources/i18n/sankore_it.ts @@ -1854,11 +1854,11 @@ Vuoi ignorare gli errori per questo host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/sankore_iw.ts index 9ce57b52..823f7fb8 100644 --- a/resources/i18n/sankore_iw.ts +++ b/resources/i18n/sankore_iw.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/sankore_ja.ts index 1a5038bc..ec77e051 100644 --- a/resources/i18n/sankore_ja.ts +++ b/resources/i18n/sankore_ja.ts @@ -1855,11 +1855,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/sankore_ko.ts index a264e9d9..cce0a0de 100644 --- a/resources/i18n/sankore_ko.ts +++ b/resources/i18n/sankore_ko.ts @@ -1854,11 +1854,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/sankore_nb.ts index 031ffb1b..ad7040d3 100644 --- a/resources/i18n/sankore_nb.ts +++ b/resources/i18n/sankore_nb.ts @@ -1849,11 +1849,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/sankore_nl.ts index 6949a52c..af0cf6ce 100644 --- a/resources/i18n/sankore_nl.ts +++ b/resources/i18n/sankore_nl.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/sankore_pl.ts index 70663776..9f20715c 100644 --- a/resources/i18n/sankore_pl.ts +++ b/resources/i18n/sankore_pl.ts @@ -1855,11 +1855,11 @@ Czy chcesz ignorować te błędy dla tego hosta? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/sankore_pt.ts index 6ea05ac5..cc80aa9e 100644 --- a/resources/i18n/sankore_pt.ts +++ b/resources/i18n/sankore_pt.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_rm.ts b/resources/i18n/sankore_rm.ts index b705e05a..b0345c77 100644 --- a/resources/i18n/sankore_rm.ts +++ b/resources/i18n/sankore_rm.ts @@ -1848,11 +1848,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/sankore_ro.ts index a2aa70e0..013ffe24 100644 --- a/resources/i18n/sankore_ro.ts +++ b/resources/i18n/sankore_ro.ts @@ -1854,11 +1854,11 @@ Doriţi să ignoraţi aceste erori pentru acest host? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/sankore_ru.ts index e42f1e8c..f1855b28 100644 --- a/resources/i18n/sankore_ru.ts +++ b/resources/i18n/sankore_ru.ts @@ -1,6 +1,6 @@ - + BlackoutWidget @@ -81,11 +81,11 @@ Tutorial - Учебное руководство + Учебник Stylus - Инструменты для ввода + Инструменты Ctrl+T @@ -109,7 +109,7 @@ Redo - Восстановить + Вернуть Ctrl+Y @@ -281,7 +281,7 @@ Show Desktop - Показать рабочий стол + Рабочий стол Show Computer Desktop @@ -757,7 +757,7 @@ Open the tutorial - Открыть учебное руководство + Открыть учебник Check Update @@ -976,7 +976,7 @@ Show the stylus palette - Показать панель элементов для ввода + Показать инструменты Show Board on Secondary Screen @@ -984,7 +984,7 @@ Show Desktop on Secondary Screen - Показать рабочий стол на втором экране + Показать раб. стол на втором экране @@ -1111,7 +1111,8 @@ Are you sure you want to remove %n page(s) from the selected document '%1'? - + + Вы уверены, что хотите удалить %n страниц из выбранного документа '%1'? @@ -1193,7 +1194,7 @@ UBDocumentTreeWidget %1 (copy) - %1 (копия) + %1 (копирование) Copying page %1/%2 @@ -1203,6 +1204,7 @@ %1 pages copied + @@ -1665,7 +1667,7 @@ Do you want to ignore these errors for this host? on your desktop ... - на вашем рабочем столе... + на вашем раб. столе... in folder %1 @@ -1780,23 +1782,23 @@ Do you want to ignore these errors for this host? UBTeacherBarWidget Title - Название + Название Phasis - + Тип урока Duration - + Длительность Equipment - + Оборудование Activity - + Участники @@ -1804,62 +1806,70 @@ Do you want to ignore these errors for this host? I discover - + Открытие I experiment - + Эксперименты I train myself - + Самостоятельно I play - + Игра I memorize - + Заметка Short - + Не долго Middle - + Средне Long - + Долго Alone - + Один By Group - + Группы All together - + Все вместе UBTeacherStudentAction Action %0 - + Действие %0 Enseignant - + Teacher Élève - + Student + + + Teacher + Учитель + + + Student + Студент @@ -1965,7 +1975,7 @@ Please reboot the application to access the updated documents. Remind me later - + Напомнить позже @@ -2506,7 +2516,7 @@ p, li { white-space: pre-wrap; } Stylus Palette - Панель инструментов для ввода + Инструменты Horizontal diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/sankore_sv.ts index adfa1a82..71b2bcbf 100644 --- a/resources/i18n/sankore_sv.ts +++ b/resources/i18n/sankore_sv.ts @@ -1854,11 +1854,11 @@ Vill du ignorera felen för den här värden? - Enseignant + Teacher - Élève + Student diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/sankore_zh.ts index 83979695..0d513289 100644 --- a/resources/i18n/sankore_zh.ts +++ b/resources/i18n/sankore_zh.ts @@ -1854,11 +1854,11 @@ Do you want to ignore these errors for this host? - Enseignant + Teacher - Élève + Student diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index dd8e47c1..d5ff09e6 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -12,8 +12,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #include "UBBoardView.h" #include diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index c3986972..52c21bb2 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -357,8 +357,8 @@ UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent mpTeacherLayout = new QHBoxLayout(); //TODO: I'm not able to translate this string using the normal way *qm file why? - //mpTeacherLabel = new QLabel(tr("Teacher"), this); - mpTeacherLabel = new QLabel(tr("Enseignant"), this); + mpTeacherLabel = new QLabel(tr("Teacher"), this); +// mpTeacherLabel = new QLabel(tr("Enseignant"), this); mpTeacherLabel->setAlignment(Qt::AlignTop); mpTeacher = new QTextEdit(this); mpTeacher->setObjectName("TeacherStudentBox"); @@ -368,8 +368,8 @@ UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent mpLayout->addLayout(mpTeacherLayout, 1); mpStudentLayout = new QHBoxLayout(); -// mpStudentLabel = new QLabel(tr("Student"), this); - mpStudentLabel = new QLabel(tr("Élève"), this); + mpStudentLabel = new QLabel(tr("Student"), this); +// mpStudentLabel = new QLabel(tr("Élève"), this); mpStudentLabel->setAlignment(Qt::AlignTop); mpStudent = new QTextEdit(this); mpStudent->setObjectName("TeacherStudentBox"); diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 3f18bcbe..a021027f 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -15,6 +15,8 @@ class UBTeacherStudentAction : public QWidget { + Q_OBJECT + public: UBTeacherStudentAction(int actionNumber, QWidget* parent=0, const char* name="UBTeacherStudentAction"); ~UBTeacherStudentAction();