Skip to content

Commit

Permalink
do not translate keyboard short cuts
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25071 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Henning Kiel committed Mar 12, 2015
1 parent 0a1aa27 commit a9f40e4
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 69 deletions.
45 changes: 15 additions & 30 deletions OMShell/OMShellGUI/OMShell_de.ts
View file
Expand Up @@ -8,11 +8,6 @@
<source>OMShell - OpenModelica Shell</source>
<translation>OMShell - OpenModelica Shell</translation>
</message>
<message>
<location filename="oms.cpp" line="374"/>
<source>Ctrl+L</source>
<translation>Strg+L</translation>
</message>
<message>
<location filename="oms.cpp" line="369"/>
<source>Open mo-file</source>
Expand Down Expand Up @@ -40,11 +35,6 @@
<source>&amp;Exit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
<location filename="oms.cpp" line="380"/>
<source>Ctrl+D</source>
<translation>Strg+D</translation>
</message>
<message>
<location filename="oms.cpp" line="381"/>
<source>Quit the application</source>
Expand All @@ -55,31 +45,16 @@
<source>Cu&amp;t</source>
<translation>Aus&amp;schneiden</translation>
</message>
<message>
<location filename="oms.cpp" line="386"/>
<source>Ctrl+X</source>
<translation>Strg+X</translation>
</message>
<message>
<location filename="oms.cpp" line="391"/>
<source>&amp;Copy</source>
<translation>&amp;Kopieren</translation>
</message>
<message>
<location filename="oms.cpp" line="392"/>
<source>Ctrl+C</source>
<translation>Strg+C</translation>
</message>
<message>
<location filename="oms.cpp" line="397"/>
<source>&amp;Paste</source>
<translation>&amp;Einfügen</translation>
</message>
<message>
<location filename="oms.cpp" line="398"/>
<source>Ctrl+V</source>
<translation>Strg+V</translation>
</message>
<message>
<location filename="oms.cpp" line="404"/>
<source>&amp;FontSize</source>
Expand All @@ -100,6 +75,14 @@
<source>Cut the selection</source>
<translation>Auswahl ausschneiden</translation>
</message>
<message>
<location filename="oms.cpp" line="275"/>
<source>
To get help on using OMShell and OpenModelica, type &quot;help()&quot; and press enter.
</source>
<translation>
Um Hilfe zur Benutzung von OMShell und OpenModelica zu bekommen, tippen Sie &quot;help()&quot; und dann Enter.</translation>
</message>
<message>
<location filename="oms.cpp" line="393"/>
<source>Copy the selection</source>
Expand All @@ -125,11 +108,6 @@
<source>Cl&amp;ear</source>
<translation>&amp;Löschen</translation>
</message>
<message>
<location filename="oms.cpp" line="421"/>
<source>Ctrl+Shift+C</source>
<translation>Strg+Umschalt+C</translation>
</message>
<message>
<location filename="oms.cpp" line="422"/>
<source>Clear the input window</source>
Expand Down Expand Up @@ -170,6 +148,13 @@
<source>Close OMC</source>
<translation>OMC schließen</translation>
</message>
<message>
<location filename="oms.cpp" line="818"/>
<source>OK to quit running OpenModelica Compiler process at exit?
(Answer No if other OMShell/OMNotebook/Graphic editor is still running)</source>
<translation>OK zum Beenden des OpenModelica Compiler Prozesses beim Verlassen?
(Wählen Sie Neine, wenn andere OMShell/OMNotebook Instanzen noch laufen)</translation>
</message>
<message>
<location filename="oms.cpp" line="865"/>
<source>[ERROR] Selected fontsize not between 8 and 120.
Expand Down
43 changes: 13 additions & 30 deletions OMShell/OMShellGUI/OMShell_sv.ts
View file
Expand Up @@ -12,11 +12,6 @@
<source>&amp;Load Model...</source>
<translation type="obsolete">&amp;Öppna</translation>
</message>
<message>
<location filename="oms.cpp" line="374"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
<location filename="oms.cpp" line="369"/>
<source>Open mo-file</source>
Expand All @@ -34,6 +29,13 @@
<oldsource>&amp;Load</oldsource>
<translation>&amp;Öppna</translation>
</message>
<message>
<location filename="oms.cpp" line="275"/>
<source>
To get help on using OMShell and OpenModelica, type &quot;help()&quot; and press enter.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="oms.cpp" line="375"/>
<source>Load the Modelica Standard Library</source>
Expand All @@ -44,11 +46,6 @@
<source>&amp;Exit</source>
<translation>A&amp;vsluta</translation>
</message>
<message>
<location filename="oms.cpp" line="380"/>
<source>Ctrl+D</source>
<translation></translation>
</message>
<message>
<location filename="oms.cpp" line="381"/>
<source>Quit the application</source>
Expand All @@ -59,11 +56,6 @@
<source>Cu&amp;t</source>
<translation>&amp;Klipp ut</translation>
</message>
<message>
<location filename="oms.cpp" line="386"/>
<source>Ctrl+X</source>
<translation></translation>
</message>
<message>
<location filename="oms.cpp" line="387"/>
<source>Cut the selection</source>
Expand All @@ -89,6 +81,12 @@
<source>About Qt</source>
<translation>Om Qt</translation>
</message>
<message>
<location filename="oms.cpp" line="818"/>
<source>OK to quit running OpenModelica Compiler process at exit?
(Answer No if other OMShell/OMNotebook/Graphic editor is still running)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="oms.cpp" line="865"/>
<source>[ERROR] Selected fontsize not between 8 and 120.
Expand All @@ -105,11 +103,6 @@
<source>&amp;Copy</source>
<translation>K&amp;opiera</translation>
</message>
<message>
<location filename="oms.cpp" line="392"/>
<source>Ctrl+C</source>
<translation></translation>
</message>
<message>
<source>Copy the selection and put it on the Clipboard</source>
<translation type="obsolete">Kopiera markeringen</translation>
Expand All @@ -119,11 +112,6 @@
<source>&amp;Paste</source>
<translation>K&amp;listra in</translation>
</message>
<message>
<location filename="oms.cpp" line="398"/>
<source>Ctrl+V</source>
<translation></translation>
</message>
<message>
<source>Insert Clipboard contents</source>
<translation type="obsolete">Klistra in</translation>
Expand Down Expand Up @@ -160,11 +148,6 @@
<source>Cl&amp;ear</source>
<translation>&amp;Rensa</translation>
</message>
<message>
<location filename="oms.cpp" line="421"/>
<source>Ctrl+Shift+C</source>
<translation></translation>
</message>
<message>
<location filename="oms.cpp" line="422"/>
<source>Clear the input window</source>
Expand Down
18 changes: 9 additions & 9 deletions OMShell/OMShellGUI/oms.cpp
View file
Expand Up @@ -272,7 +272,7 @@ OMS::OMS( QWidget* parent )
const char* dateStr = __DATE__; // "Mmm dd yyyy", so dateStr+7 = "yyyy"
copyright_info_ = QString("OMShell 1.1 Copyright Open Source Modelica Consortium (OSMC) 2002-") + (dateStr+7) + "\nDistributed under OMSC-PL and GPL, see www.openmodelica.org\n\nConnected to OpenModelica " + omc_version_;
cursor_.insertText( copyright_info_, textFormat_ );
cursor_.insertText( "\nTo get help on using OMShell and OpenModelica, type \"help()\" and press enter.\n", textFormat_ );
cursor_.insertText( tr("\nTo get help on using OMShell and OpenModelica, type \"help()\" and press enter.\n"), textFormat_ );


// create command compleation instance
Expand Down Expand Up @@ -365,37 +365,37 @@ void OMS::createMoshEdit()
void OMS::createAction()
{
loadModel_ = new QAction( tr("&Open"), this );
loadModel_->setShortcut( tr("Ctrl+O") );
loadModel_->setShortcut( "Ctrl+O" );
loadModel_->setStatusTip( tr("Open mo-file") );
connect( loadModel_, SIGNAL( triggered() ),
this, SLOT( loadModel() ));

loadModelicaLibrary_ = new QAction( tr("Load &Modelica Library"), this );
loadModelicaLibrary_->setShortcut( tr("Ctrl+L") );
loadModelicaLibrary_->setShortcut( "Ctrl+L" );
loadModelicaLibrary_->setStatusTip( tr("Load the Modelica Standard Library") );
connect( loadModelicaLibrary_, SIGNAL( triggered() ),
this, SLOT( loadModelicaLibrary() ));

exit_ = new QAction( tr("&Exit"), this );
exit_->setShortcut( tr("Ctrl+D") );
exit_->setShortcut( "Ctrl+D" );
exit_->setStatusTip( tr("Quit the application") );
connect( exit_, SIGNAL( triggered() ),
this, SLOT( close() ));

cut_ = new QAction( tr("Cu&t"), this );
cut_->setShortcut( tr("Ctrl+X") );
cut_->setShortcut( "Ctrl+X" );
cut_->setStatusTip( tr("Cut the selection") );
connect( cut_, SIGNAL( triggered() ),
this, SLOT( cut() ));

copy_ = new QAction( tr("&Copy"), this );
copy_->setShortcut( tr("Ctrl+C") );
copy_->setShortcut( "Ctrl+C" );
copy_->setStatusTip( tr("Copy the selection") );
connect( copy_, SIGNAL( triggered() ),
this, SLOT( copy() ));

paste_ = new QAction( tr("&Paste"), this );
paste_->setShortcut( tr("Ctrl+V") );
paste_->setShortcut( "Ctrl+V" );
paste_->setStatusTip( tr("Insert from clipboard") );
connect( paste_, SIGNAL( triggered() ),
this, SLOT( paste() ));
Expand All @@ -418,7 +418,7 @@ void OMS::createAction()
this, SLOT( aboutQT() ));

clearWindow_ = new QAction( tr("Cl&ear"), this );
clearWindow_->setShortcut( tr("Ctrl+Shift+C") );
clearWindow_->setShortcut( "Ctrl+Shift+C" );
clearWindow_->setStatusTip( tr("Clear the input window") );
connect( clearWindow_, SIGNAL( triggered() ),
this, SLOT( clear() ));
Expand Down Expand Up @@ -815,7 +815,7 @@ bool OMS::exit()
QMessageBox *msgBox = new QMessageBox(0);
msgBox->setWindowTitle(tr("Close OMC"));
msgBox->setIcon(QMessageBox::Question);
msgBox->setText("OK to quit running OpenModelica Compiler process at exit?\n(Answer No if other OMShell/OMNotebook/Graphic editor is still running)");
msgBox->setText(tr("OK to quit running OpenModelica Compiler process at exit?\n(Answer No if other OMShell/OMNotebook/Graphic editor is still running)"));
msgBox->setStandardButtons(QMessageBox::Ok | QMessageBox::No | QMessageBox::Cancel);
msgBox->setDefaultButton(QMessageBox::Ok);

Expand Down

0 comments on commit a9f40e4

Please sign in to comment.