Mercurial > hg > octave-terminal
changeset 13566:d22b9973120f
Renamed language files to match convention.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Mon, 01 Aug 2011 00:36:21 +0200 |
parents | da49b128a4d3 |
children | 395393bd2f56 |
files | gui/languages/de-de.qm gui/languages/de-de.ts gui/languages/generic.ts gui/languages/german.qm gui/languages/german.ts gui/languages/pt-br.ts gui/octave-gui.pro gui/src/FileEditorMdiSubWindow.cpp |
diffstat | 6 files changed, 151 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
rename from gui/languages/german.ts rename to gui/languages/de-de.ts --- a/gui/languages/german.ts +++ b/gui/languages/de-de.ts @@ -4,74 +4,109 @@ <context> <name>FileEditorMdiSubWindow</name> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="91"/> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="184"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="92"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="185"/> <source>File Editor</source> <translation type="unfinished">Dateieditor</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="92"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="93"/> <source>Cannot read file %1: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="104"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="105"/> <source>File loaded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="130"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="131"/> <source>Do you want to save the current file %1 ?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="185"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="186"/> <source>Cannot write file %1: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="197"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="198"/> <source>File %1 saved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="294"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="312"/> <source>&Close File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="297"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="315"/> <source>&New File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="300"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="318"/> <source>&Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="303"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="321"/> <source>&Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="306"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="324"/> <source>Save File &As</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="309"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="327"/> <source>&Undo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="312"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="330"/> <source>&Redo</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="331"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="332"/> + <source>Cu&t</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="333"/> + <source>&Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="336"/> + <source>&Run File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="367"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="375"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/> + <source>&Run</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FilesDockWidget</name>
--- a/gui/languages/generic.ts +++ b/gui/languages/generic.ts @@ -4,74 +4,109 @@ <context> <name>FileEditorMdiSubWindow</name> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="91"/> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="184"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="92"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="185"/> <source>File Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="92"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="93"/> <source>Cannot read file %1: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="104"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="105"/> <source>File loaded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="130"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="131"/> <source>Do you want to save the current file %1 ?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="185"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="186"/> <source>Cannot write file %1: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="197"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="198"/> <source>File %1 saved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="294"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="312"/> <source>&Close File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="297"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="315"/> <source>&New File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="300"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="318"/> <source>&Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="303"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="321"/> <source>&Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="306"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="324"/> <source>Save File &As</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="309"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="327"/> <source>&Undo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="312"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="330"/> <source>&Redo</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="331"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="332"/> + <source>Cu&t</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="333"/> + <source>&Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="336"/> + <source>&Run File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="367"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="375"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/> + <source>&Run</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FilesDockWidget</name>
--- a/gui/languages/pt-br.ts +++ b/gui/languages/pt-br.ts @@ -4,74 +4,109 @@ <context> <name>FileEditorMdiSubWindow</name> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="91"/> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="184"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="92"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="185"/> <source>File Editor</source> <translation>Editor de Arquivos</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="92"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="93"/> <source>Cannot read file %1: %2.</source> <translation>Não foi possível ler o arquivo %1: %2.</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="104"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="105"/> <source>File loaded.</source> <translation>Arquivo carregado.</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="130"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="131"/> <source>Do you want to save the current file %1 ?</source> <translation>Você deseja salvar o arquivo atual %1 ?</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="185"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="186"/> <source>Cannot write file %1: %2.</source> <translation>Não foi possível escrever no arquivo %1: %2.</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="197"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="198"/> <source>File %1 saved</source> <translation>Arquivo %1 salvo</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="294"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="312"/> <source>&Close File</source> <translation>&Fechar Arquivo</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="297"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="315"/> <source>&New File</source> <translation>&Novo Arquivo</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="300"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="318"/> <source>&Open File</source> <translation>&Abrir Arquivo</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="303"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="321"/> <source>&Save File</source> <translation>&Salvar Arquivo</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="306"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="324"/> <source>Save File &As</source> <translation>Salvar Arquivo &Como</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="309"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="327"/> <source>&Undo</source> <translation>&Desfazer</translation> </message> <message> - <location filename="../src/FileEditorMdiSubWindow.cpp" line="312"/> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="330"/> <source>&Redo</source> <translation>&Refazer</translation> </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="331"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="332"/> + <source>Cu&t</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="333"/> + <source>&Paste</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="336"/> + <source>&Run File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="367"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="375"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/FileEditorMdiSubWindow.cpp" line="383"/> + <source>&Run</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>FilesDockWidget</name>
--- a/gui/octave-gui.pro +++ b/gui/octave-gui.pro @@ -27,7 +27,7 @@ OBJECTS_DIR = object-files # Folder for object files TRANSLATIONS += languages/generic.ts \ - languages/german.ts \ + languages/de-de.ts \ languages/pt-br.ts # Available translations LIBS += -lqscintilla2
--- a/gui/src/FileEditorMdiSubWindow.cpp +++ b/gui/src/FileEditorMdiSubWindow.cpp @@ -281,6 +281,7 @@ { QStyle *style = QApplication::style (); setWidget (new QWidget ()); + m_menuBar = new QMenuBar (this); m_toolBar = new QToolBar (this); m_statusBar = new QStatusBar (this); @@ -362,7 +363,7 @@ m_toolBar->addSeparator(); m_toolBar->addAction (runAction); - // menu bar + // menu bar QMenu *fileMenu = new QMenu(tr("&File"),m_menuBar); fileMenu->addAction(newAction); fileMenu->addAction(openAction); @@ -383,6 +384,7 @@ runMenu->addAction(runAction); m_menuBar->addMenu(runMenu); + QVBoxLayout *layout = new QVBoxLayout (); layout->addWidget (m_menuBar); layout->addWidget (m_toolBar);