From 69fd9fd15e17fcde34d553256bf971e1169e07fa Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 28 Aug 2013 18:51:47 +0400 Subject: [PATCH] Fixed translations --- .../mathmech/resources/translations/eng.qm | Bin 11622 -> 20256 bytes .../mathmech/resources/translations/eng.ts | 589 +++++++++--------- .../mathmech/resources/translations/rus.qm | Bin 20385 -> 20527 bytes .../mathmech/resources/translations/rus.ts | 63 +- mathmech/mathmech/src/mathmech.pro.user | 2 +- mathmech/mathmech/src/settingswindow.cpp | 7 +- mathmech/mathmech/src/settingswindow.h | 1 + mathmech/mathmech/src/settingswindow.ui | 32 + 8 files changed, 377 insertions(+), 317 deletions(-) diff --git a/mathmech/mathmech/resources/translations/eng.qm b/mathmech/mathmech/resources/translations/eng.qm index ccb6cd8f7be9bfdcfddb85d79c1e9441478b5504..d843fd1d547b5a93e07d65d901031a429937dfc6 100644 GIT binary patch literal 20256 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 OQvIIsgDU^#rv(7z-+Ac( diff --git a/mathmech/mathmech/resources/translations/eng.ts b/mathmech/mathmech/resources/translations/eng.ts index b871e32..1507361 100644 --- a/mathmech/mathmech/resources/translations/eng.ts +++ b/mathmech/mathmech/resources/translations/eng.ts @@ -23,12 +23,24 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">E-mail:</span> esalexeev@gmail.com</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Graphical user interface for &quot;mathmech&quot; program pack.</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Liberation Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Mathematical Molecular Mechanics</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Version:</span> 1.0.0</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">License:</span> GPL</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Author:</span> Evgeniy Alekseev</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">E-mail:</span> esalexeev@gmail.com</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Graphical user interface for &quot;mathmech&quot; program pack.</p></body></html> Close - + Close @@ -36,63 +48,63 @@ p, li { white-space: pre-wrap; } Select file - + Select file 'statgen' output files (*.dat);;All files (*.*) - + 'statgen' output files (*.dat);;All files (*.*) Save file as... - + Save file as... Agglomerate files (*.agl);;All files (*.*) - + Agglomerate files (*.agl);;All files (*.*) Agglomerate - + Agglomerate Input file - + Input file Browse - + Browse Select - + Select Output file - + Output file Clear - + Clear Create - + Create Close - + Close @@ -101,12 +113,12 @@ p, li { white-space: pre-wrap; } Processing 'agl'... - + Processing 'agl'... Done - + Done @@ -114,107 +126,92 @@ p, li { white-space: pre-wrap; } Select work directory - + Select work directory Select trajectory file - + Select trajectory file 'statgen' output files (*.dat);;All files (*.*) - + 'statgen' output files (*.dat);;All files (*.*) Save file as... - + Save file as... PDB files (*.pdb);;All files (*.*) - + PDB files (*.pdb);;All files (*.*) agl_all - + agl_all Work directory - + Work directory Browse - + Browse Input file - + Input file Mask of output files - + Mask of output files File - + File Number of molecules - + Number of molecules Clear - + Clear Start - + Start Close - + Close AtomTypesWindow - - Atom types - + + Save file as... + Save file as... - - Output file - - - - - Browse - - - - - Molecule - - - - - 1 - + + Atom types files (*.types);;All files (*.*) + Atom types files (*.types);;All files (*.*) @@ -222,57 +219,72 @@ p, li { white-space: pre-wrap; } Add new molecule - + Add new molecule + + + + Atom types + Atom types + + + + Output file + Output file + + + + Browse + Browse + + + + Molecule + Molecule + + + + 1 + 1 Number of molecules - + Number of molecules Char atom type - + Char atom type Int atom type - + Int atom type Add - + Add Remove - + Remove Clear - + Clear Create - + Create Close - - - - - Save file as... - - - - - Atom types files (*.types);;All files (*.*) - + Close @@ -280,87 +292,87 @@ p, li { white-space: pre-wrap; } Work directory does not exists - + Work directory does not exists Input file is not set - + Input file is not set Atoms in plane must be different - + Atoms in plane must be different Atom types file is not set - + Atom types file is not set Output file is not set - + Output file is not set Atom type must contain 2 characters - + Atom type must contain 2 characters Log file is not set - + Log file is not set Component is not found - + Component is not found Atom types is not set - + Atom types is not set Something wrong - + Something wrong Interactions are not set - + Interactions are not set Invalid file type - + Invalid file type Interaction step is not set - + Interaction step is not set Unknown error - + Unknown error Error - + Error Error text - + Error text Ok - + Ok @@ -368,7 +380,7 @@ p, li { white-space: pre-wrap; } Ready - + Ready @@ -377,39 +389,39 @@ p, li { white-space: pre-wrap; } Select work directory - + Select work directory Select trajectory file - + Select trajectory file All files (*.*) - + All files (*.*) Select atom types file - + Select atom types file Atom types files (*.types);;All files (*.*) - + Atom types files (*.types);;All files (*.*) Save files as - + Save files as Mask of trajectory files - + Mask of trajectory files @@ -418,7 +430,7 @@ p, li { white-space: pre-wrap; } Save log file as... - + Save log file as... @@ -427,13 +439,13 @@ p, li { white-space: pre-wrap; } Log files (*.log) - + Log files (*.log) Select trajectory files - + Select trajectory files @@ -441,47 +453,47 @@ p, li { white-space: pre-wrap; } Trajectory files (*.*[0-9]) - + Trajectory files (*.*[0-9]) Save output file as... - + Save output file as... Output files (*.dat) - + Output files (*.dat) Save PDB file as... - + Save PDB file as... PDB files (*.pdb) - + PDB files (*.pdb) Select agglomerate file - + Select agglomerate file Agglomerate files (*.agl);;All files (*.*) - + Agglomerate files (*.agl);;All files (*.*) Processing 'trj'... - + Processing 'trj'... @@ -490,47 +502,97 @@ p, li { white-space: pre-wrap; } Done - + Done Processing 'statgen'... - + Processing 'statgen'... Processing 'envir'... - + Processing 'envir'... Processing 'radf'... - + Processing 'radf'... Processing 'agl'... - + Processing 'agl'... Processing 'trj2pdb'... - + Processing 'trj2pdb'... Mathematical Molecular Mechanics - + Mathematical Molecular Mechanics - - Generate trajectory - + + &Quit + &Quit + + + + Quit + Quit + + + + Ctrl+Q + Ctrl+Q + + + + &Help + &Help + + + + F1 + F1 + + + + About + About + + + + Atom &types file + Atom &types file + + + + &Agglomerate file + &Agglomerate file + + + + &Settings + &Settings + + + + agl_all + agl_all + + + + statgen_all + statgen_all @@ -539,7 +601,7 @@ p, li { white-space: pre-wrap; } Work directory - + Work directory @@ -565,49 +627,49 @@ p, li { white-space: pre-wrap; } Browse - + Browse Input file - + Input file Type of trajectory - + Type of trajectory GROMACS text - + GROMACS text PUMA - + PUMA Number of steps - + Number of steps Atom type file - + Atom type file Mask of output files - + Mask of output files Total atom types - + Total atom types @@ -616,7 +678,7 @@ p, li { white-space: pre-wrap; } Log - + Log @@ -625,7 +687,7 @@ p, li { white-space: pre-wrap; } Clear - + Clear @@ -634,36 +696,36 @@ p, li { white-space: pre-wrap; } Start - + Start - - Agglomeration - + + Generate trajectory + Generate trajectory Mask of input files - + Mask of input files Steps - + Steps first - + first last - + last @@ -671,7 +733,7 @@ p, li { white-space: pre-wrap; } Cell, A - + Cell, A @@ -679,7 +741,7 @@ p, li { white-space: pre-wrap; } X - + X @@ -687,7 +749,7 @@ p, li { white-space: pre-wrap; } Y - + Y @@ -695,58 +757,58 @@ p, li { white-space: pre-wrap; } Z - + Z atom 0 - + atom 0 atom 1 - + atom 1 atom 2 - + atom 2 atom 3 - + atom 3 Interaction - + Interaction 0-0 - + 0-0 Save - + Save Add - + Add Remove - + Remove @@ -754,91 +816,91 @@ p, li { white-space: pre-wrap; } Output file - + Output file Depth of search - + Depth of search Analysis - + Analysis Graph - + Graph - - Environment - + + Agglomeration + Agglomeration Molecule - + Molecule Radius - + Radius - - RADF - + + Environment + Environment One atom function - + One atom function Three atom function - + Three atom function R, A - + R, A min - + min max - + max step - + step Angle, deg - + Angle, deg Matrix - + Matrix - - Generate PDB - + + RADF + RADF @@ -848,175 +910,130 @@ p, li { white-space: pre-wrap; } From trajectory snapshot - + From trajectory snapshot File with agglomerate - + File with agglomerate + + + + Generate PDB + Generate PDB Menu - + Menu File &creator - + File &creator &Tools - + &Tools Help - - - - - &Quit - - - - - Quit - - - - - Ctrl+Q - - - - - &Help - - - - - F1 - - - - - About - - - - - Atom &types file - - - - - &Agglomerate file - - - - - &Settings - - - - - agl_all - - - - - statgen_all - + Help SettingsWindow - - - - - - + + + + + + Select component - + Select component - - - - - - + + + + + + All files (*) - + All files (*) - + Settings - + Settings - + mm_trj - + mm_trj - - - - - - + + + + + + Browse - + Browse - + mm_statgen - + mm_statgen - + mm_envir - + mm_envir - + mm_radf - + mm_radf - + mm_trj2pdb - + mm_trj2pdb - + mm_agl - + mm_agl - + English - + English - + Russian - + Russian - + + You need to restart application + You need to restart application + + + Save - + Save - + Close - + Close @@ -1024,47 +1041,47 @@ p, li { white-space: pre-wrap; } N - + N p - + p r - + r g - + g Save image as... - + Save image as... JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) - + JPEG file (*.jpeg);;Portable Network Graphics file (*.png);;Bitmap file (*.bmp) Graph - + Graph Save - + Save Close - + Close diff --git a/mathmech/mathmech/resources/translations/rus.qm b/mathmech/mathmech/resources/translations/rus.qm index 93ce3cdb112479b9e1d362dc1062faad1714c468..086f2fba4d3ddfac32412eff4fd3fccdfdf848ad 100644 GIT binary patch delta 290 zcmZ2DpK<*H#t9;V8yFZE3>g>{xEUB2{1_NK{!dhu7re^Az)--z;Q60{fuV?j!Ao;u zs2h`K+QhkWOrDw(|F%m`XYiSs#K55TfWfaLgMq==8bZ5YoIICt8IxP?WLGA0#ub}u zne-UB+$`9gv%44=+!ZHpW$t9Rn&QX6;JRtDEsMC|1FkJD=?n~-N4c)mdNMG0a86ET zNn>&kn|zk#Gm}^F=0mL8T=QI5WLZpE>{tw0Tv_Z`Ojs;fY*-8!6jV`EM_dGEVe8bEdCq}3=9lx3=9nNk@=+xd8w%>3MKgp hMXALliA5y}i3J5YnaPPInfZB>KYB`RuJG1m0RR$JNT>h+ delta 189 zcmZ3#fN|k`#t9;VD;O9U3>g>{xEUB2{1_NKDkrMS3;HuKFcdH_cvdnnFcdK`crKn8 z>c-^pVB*|3CXdAv|F%mCGWg6)Vqj2vz~I-B!N6c_4WZq=C(mVE#^m~ZvMZB0qtfPD zCOt+j*G=rs*oDSz~J6IIhQ4k$?d}At1O?HJkM@E#k$RP@_QeS&3rzJEC9DMH}wDj diff --git a/mathmech/mathmech/resources/translations/rus.ts b/mathmech/mathmech/resources/translations/rus.ts index 11b8102..d925965 100644 --- a/mathmech/mathmech/resources/translations/rus.ts +++ b/mathmech/mathmech/resources/translations/rus.ts @@ -946,87 +946,92 @@ p, li { white-space: pre-wrap; } SettingsWindow - - - - - - + + + + + + Select component Выбор компонента - - - - - - + + + + + + All files (*) Все файлы (*) - + Settings Настройки - + mm_trj mm_trj - - - - - - + + + + + + Browse Обзор - + mm_statgen mm_statgen - + mm_envir mm_envir - + mm_radf mm_radf - + mm_trj2pdb mm_trj2pdb - + mm_agl mm_agl - + English English - + Russian Russian - + + You need to restart application + You need to restart application + + + Save Сохранить - + Close Закрыть diff --git a/mathmech/mathmech/src/mathmech.pro.user b/mathmech/mathmech/src/mathmech.pro.user index df00f35..afa1552 100644 --- a/mathmech/mathmech/src/mathmech.pro.user +++ b/mathmech/mathmech/src/mathmech.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/mathmech/mathmech/src/settingswindow.cpp b/mathmech/mathmech/src/settingswindow.cpp index 2b2b9a0..a2ebdb4 100644 --- a/mathmech/mathmech/src/settingswindow.cpp +++ b/mathmech/mathmech/src/settingswindow.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "errorwindow.h" #include "mainwindow.h" @@ -34,6 +33,7 @@ SettingsWindow::SettingsWindow(MainWindow *parent) : applySettings(); } showSettings(); + ui->settings_layout_lang_2->setHidden(true); } SettingsWindow::~SettingsWindow() @@ -248,3 +248,8 @@ void SettingsWindow::on_settings_pushButton_agl_clicked() if (!filename.isEmpty()) ui->settings_lineEdit_agl->setText(filename); } + +void SettingsWindow::on_settings_comboBox_lang_currentIndexChanged(int index) +{ + ui->settings_layout_lang_2->setHidden(false); +} diff --git a/mathmech/mathmech/src/settingswindow.h b/mathmech/mathmech/src/settingswindow.h index ef86aca..7762255 100644 --- a/mathmech/mathmech/src/settingswindow.h +++ b/mathmech/mathmech/src/settingswindow.h @@ -31,6 +31,7 @@ private slots: void on_settings_pushButton_radf_clicked(); void on_settings_pushButton_trj2pdb_clicked(); void on_settings_pushButton_agl_clicked(); + void on_settings_comboBox_lang_currentIndexChanged(int index); private: Ui::SettingsWindow *ui; diff --git a/mathmech/mathmech/src/settingswindow.ui b/mathmech/mathmech/src/settingswindow.ui index 8c4d811..1e5dec5 100644 --- a/mathmech/mathmech/src/settingswindow.ui +++ b/mathmech/mathmech/src/settingswindow.ui @@ -268,6 +268,38 @@ + + + + + + + + 110 + 23 + + + + + + + + + + + + 0 + 0 + + + + You need to restart application + + + + + +