Mercurial > octave
changeset 25062:32a7222d637a stable
[mq]: tr
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 30 Mar 2018 12:15:01 -0700 |
| parents | 5fef743c34d7 |
| children | a211e39e59d9 |
| files | libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/file-editor.cc libgui/src/variable-editor.cc |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Fri Mar 30 14:44:30 2018 +0200 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri Mar 30 12:15:01 2018 -0700 @@ -2242,7 +2242,7 @@ { QMessageBox::critical (nullptr, tr ("Octave Editor"), - tr ("The current codec %1\n" + tr ("The current encoding %1\n" "can not be applied.\n\n" "Please select another one or cancel saving!").arg (_encoding)); @@ -2254,7 +2254,7 @@ int ans = QMessageBox::warning (nullptr, tr ("Octave Editor"), tr ("The current editor contents can not be encoded\n" - "with the selected codec %1.\n" + "with the selected encoding %1.\n" "Using it will result in data loss!\n\n" "Do you want to chose another codec?").arg (_encoding), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
--- a/libgui/src/m-editor/file-editor.cc Fri Mar 30 14:44:30 2018 +0200 +++ b/libgui/src/m-editor/file-editor.cc Fri Mar 30 12:15:01 2018 -0700 @@ -1740,7 +1740,7 @@ m_conv_eol_windows_action = add_action (m_edit_fmt_menu, - tr ("convert line endings to &windows (crlf)"), + tr ("Convert line endings to &windows (crlf)"), SLOT (request_conv_eol_windows (bool))); m_conv_eol_unix_action @@ -2238,7 +2238,7 @@ // configure and show active actions of mru-menu for (int i = 0; i < num_files; ++i) { - QString text = tr ("&%1 %2"). + QString text = QString ("&%1 %2"). arg ((i+1) % int (MaxMRUFiles)).arg (m_mru_files.at (i)); m_mru_file_actions[i]->setText (text);
--- a/libgui/src/variable-editor.cc Fri Mar 30 14:44:30 2018 +0200 +++ b/libgui/src/variable-editor.cc Fri Mar 30 12:15:01 2018 -0700 @@ -359,8 +359,8 @@ QString file = QFileDialog::getSaveFileName (this, tr ("Save Variable %1 As").arg (name), - /* Should determine extension from save_default_options */ - tr ("./%1.txt").arg (name), + // FIXME: Should determine extension from save_default_options + QString ("./%1.txt").arg (name), 0, 0, QFileDialog::DontUseNativeDialog);