Translation fixes

14 years ago · a3b8fa10bd
parent b5a9d6469e
commit a3b8fa10bd
24 changed files with 90 additions and 80 deletions
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/resources/i18n/sankore_fr.ts
+++ b/resources/i18n/sankore_fr.ts
@ -1856,11 +1856,11 @@ Voulez-vous ignorer les erreurs pour ce serveur?</translation>
        <translation>Action %0</translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -1967,7 +1967,7 @@ Veuillez redémarrer l&apos;application pour accéder aux documents mis à jour.
    </message>
    <message>
        <source>Remind me later</source>
-        <translation type="Me rappeler ultérieurement"></translation>
+        <translation></translation>
    </message>
 </context>
 <context>
--- 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?</translation>
        <translation>Action %0</translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -1967,7 +1967,7 @@ Veuillez redémarrer l&apos;application pour accéder aux documents mis à jour.
    </message>
    <message>
        <source>Remind me later</source>
-        <translation type="Me rappeler ultérieurement"></translation>
+        <translation></translation>
    </message>
 </context>
 <context>
--- a/resources/i18n/sankore_it.ts
+++ b/resources/i18n/sankore_it.ts
@ -1854,11 +1854,11 @@ Vuoi ignorare gli errori per questo host?</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/resources/i18n/sankore_ru.ts
+++ b/resources/i18n/sankore_ru.ts
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="en_US">
 <context>
    <name>BlackoutWidget</name>
    <message>
@ -81,11 +81,11 @@
    </message>
    <message>
        <source>Tutorial</source>
-        <translation>Учебное руководство</translation>
+        <translation>Учебник</translation>
    </message>
    <message>
        <source>Stylus</source>
-        <translation>Инструменты для ввода</translation>
+        <translation>Инструменты</translation>
    </message>
    <message>
        <source>Ctrl+T</source>
@ -109,7 +109,7 @@
    </message>
    <message>
        <source>Redo</source>
-        <translation>Восстановить</translation>
+        <translation>Вернуть</translation>
    </message>
    <message>
        <source>Ctrl+Y</source>
@ -281,7 +281,7 @@
    </message>
    <message>
        <source>Show Desktop</source>
-        <translation>Показать рабочий стол</translation>
+        <translation>Рабочий стол</translation>
    </message>
    <message>
        <source>Show Computer Desktop</source>
@ -757,7 +757,7 @@
    </message>
    <message>
        <source>Open the tutorial</source>
-        <translation>Открыть учебное руководство</translation>
+        <translation>Открыть учебник</translation>
    </message>
    <message>
        <source>Check Update</source>
@ -976,7 +976,7 @@
    </message>
    <message>
        <source>Show the stylus palette</source>
-        <translation>Показать панель элементов для ввода</translation>
+        <translation>Показать инструменты</translation>
    </message>
    <message>
        <source>Show Board on Secondary Screen</source>
@ -984,7 +984,7 @@
    </message>
    <message>
        <source>Show Desktop on Secondary Screen</source>
-        <translation>Показать рабочий стол на втором экране</translation>
+        <translation>Показать раб. стол на втором экране</translation>
    </message>
 </context>
 <context>
@ -1111,7 +1111,8 @@
    </message>
    <message numerus="yes">
        <source>Are you sure you want to remove %n page(s) from the selected document &apos;%1&apos;?</source>
-        <translation type="unfinished">
+        <translation>
+            <numerusform>Вы уверены, что хотите удалить %n страниц из выбранного документа &apos;%1&apos;?</numerusform>
            <numerusform></numerusform>
        </translation>
    </message>
@ -1193,7 +1194,7 @@
    <name>UBDocumentTreeWidget</name>
    <message>
        <source>%1 (copy)</source>
-        <translation>%1 (копия)</translation>
+        <translation>%1 (копирование)</translation>
    </message>
    <message>
        <source>Copying page %1/%2</source>
@ -1203,6 +1204,7 @@
        <source>%1 pages copied</source>
        <translation type="unfinished">
            <numerusform></numerusform>
+            <numerusform></numerusform>
        </translation>
    </message>
 </context>
@ -1665,7 +1667,7 @@ Do you want to ignore these errors for this host?</source>
    </message>
    <message>
        <source>on your desktop ...</source>
-        <translation>на вашем рабочем столе...</translation>
+        <translation>на вашем раб. столе...</translation>
    </message>
    <message>
        <source>in folder %1</source>
@ -1780,23 +1782,23 @@ Do you want to ignore these errors for this host?</source>
    <name>UBTeacherBarWidget</name>
    <message>
        <source>Title</source>
-        <translation type="unfinished">Название</translation>
+        <translation>Название</translation>
    </message>
    <message>
        <source>Phasis</source>
-        <translation type="unfinished"></translation>
+        <translation>Тип урока</translation>
    </message>
    <message>
        <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation>Длительность</translation>
    </message>
    <message>
        <source>Equipment</source>
-        <translation type="unfinished"></translation>
+        <translation>Оборудование</translation>
    </message>
    <message>
        <source>Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Участники</translation>
    </message>
    <message>
        <source></source>
@ -1804,62 +1806,70 @@ Do you want to ignore these errors for this host?</source>
    </message>
    <message>
        <source>I discover</source>
-        <translation type="unfinished"></translation>
+        <translation>Открытие</translation>
    </message>
    <message>
        <source>I experiment</source>
-        <translation type="unfinished"></translation>
+        <translation>Эксперименты</translation>
    </message>
    <message>
        <source>I train myself</source>
-        <translation type="unfinished"></translation>
+        <translation>Самостоятельно</translation>
    </message>
    <message>
        <source>I play</source>
-        <translation type="unfinished"></translation>
+        <translation>Игра</translation>
    </message>
    <message>
        <source>I memorize</source>
-        <translation type="unfinished"></translation>
+        <translation>Заметка</translation>
    </message>
    <message>
        <source>Short</source>
-        <translation type="unfinished"></translation>
+        <translation>Не долго</translation>
    </message>
    <message>
        <source>Middle</source>
-        <translation type="unfinished"></translation>
+        <translation>Средне</translation>
    </message>
    <message>
        <source>Long</source>
-        <translation type="unfinished"></translation>
+        <translation>Долго</translation>
    </message>
    <message>
        <source>Alone</source>
-        <translation type="unfinished"></translation>
+        <translation>Один</translation>
    </message>
    <message>
        <source>By Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Группы</translation>
    </message>
    <message>
        <source>All together</source>
-        <translation type="unfinished"></translation>
+        <translation>Все вместе</translation>
    </message>
 </context>
 <context>
    <name>UBTeacherStudentAction</name>
    <message>
        <source>Action %0</source>
-        <translation type="unfinished"></translation>
+        <translation>Действие %0</translation>
    </message>
    <message>
        <source>Enseignant</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Teacher</translation>
    </message>
    <message>
        <source>ÃlÃ¨ve</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Student</translation>
+    </message>
+    <message>
+        <source>Teacher</source>
+        <translation>Учитель</translation>
+    </message>
+    <message>
+        <source>Student</source>
+        <translation>Студент</translation>
    </message>
 </context>
 <context>
@ -1965,7 +1975,7 @@ Please reboot the application to access the updated documents.</source>
    </message>
    <message>
        <source>Remind me later</source>
-        <translation type="unfinished"></translation>
+        <translation>Напомнить позже</translation>
    </message>
 </context>
 <context>
@ -2506,7 +2516,7 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>Stylus Palette</source>
-        <translation>Панель инструментов для ввода</translation>
+        <translation>Инструменты</translation>
    </message>
    <message>
        <source>Horizontal</source>
--- 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?</translation>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Enseignant</source>
+        <source>Teacher</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>ÃlÃ¨ve</source>
+        <source>Student</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- 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 <http://www.gnu.org/licenses/>.
 */
-
-
 #include "UBBoardView.h"

 #include <QtGui>
--- 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");
--- 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();